File fix_Makefile.patch of Package vboot

Overview Repositories Revisions Requests Users Attributes Meta

File fix_Makefile.patch of Package vboot (Revision f25f727653eec862b9b961f3afb0f687)

Currently displaying revision f25f727653eec862b9b961f3afb0f687 , Show latest

--- Makefile.orig	2017-11-28 14:32:14.350700249 +0100
+++ Makefile	2017-11-28 14:47:47.200437723 +0100
@@ -229,12 +229,6 @@ LD = ${CC}
 CXX ?= g++
 PKG_CONFIG ?= pkg-config
 
-# Static?
-ifneq (${STATIC},)
-LDFLAGS += -static
-PKG_CONFIG += --static
-endif
-
 # Determine QEMU architecture needed, if any
 ifeq (${ARCH},${HOST_ARCH})
   # Same architecture; no need for QEMU
@@ -595,11 +589,11 @@ UTIL_SCRIPTS += \
 endif
 
 # These utilities should also provide static linked version (*_s).
-UTIL_NAMES_STATIC = \
-	utility/crossystem
+# UTIL_NAMES_STATIC = \
+# 	utility/crossystem
 
 UTIL_NAMES = \
-	${UTIL_NAMES_STATIC} \
+	utility/crossystem \
 	utility/dumpRSAPublicKey \
 	utility/tpmc
 
@@ -1004,7 +998,6 @@ ${UTILBDB}: ${UTILBDB_OBJS} ${BDBLIB_OBJ
 # Link tests for external repos
 ${BUILD}/host/linktest/extern: ${HOSTLIB}
 ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
-${BUILD}/host/linktest/extern: LDLIBS += -static
 TEST_OBJS += ${BUILD}/host/linktest/extern.o
 
 .PHONY: hostlib
@@ -1095,10 +1088,6 @@ ${BUILD}/utility/%: INCLUDES += -Iutilit
 ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB}
 ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
 
-# Utilities for auto-update toolkits must be statically linked.
-${UTIL_BINS_STATIC}: LDFLAGS += -static
-
-
 .PHONY: utils
 utils: ${UTIL_BINS} ${UTIL_SCRIPTS}
 	${Q}cp -f ${UTIL_SCRIPTS} ${BUILD}/utility
@@ -1130,7 +1119,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
 ${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS}
 ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
-	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
+	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
 
 ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB20}
 ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB20} ${UTILBDB}

Places

File fix_Makefile.patch of Package vboot (Revision f25f727653eec862b9b961f3afb0f687)

Places