diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2019-08-01 16:57:56 +0800 |
|---|---|---|
| committer | Hung-Te Lin <hungte@chromium.org> | 2019-08-01 09:00:16 +0000 |
| commit | 27366ab7a6e7fe95139ea5741734ca215ce9b2d1 (patch) | |
| tree | b388368dfc1362739d8df520b72bc8e08d292e17 | |
| parent | 6d82d77aaa50aa42b3ef15c5767274a76b6dca3e (diff) | |
| download | vboot-factory-oak-8182.B.tar.gz | |
futility: Include libzip properlyfactory-oak-8182.B
The libzip in Makefile was not properly handled in factory branches and
need to be updated.
BUG=b:138632591
TEST=emerge-oak vboot_reference
Change-Id: I52cb15ee831d57f73b472f6c961f32cce3683294
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1729714
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -227,7 +227,7 @@ endif # Optional Libraries LIBZIP_VERSION := $(shell ${PKG_CONFIG} --modversion libzip 2>/dev/null) -# HAVE_LIBZIP := $(if ${LIBZIP_VERSION},1) +HAVE_LIBZIP := $(if ${LIBZIP_VERSION},1) ifneq (${HAVE_LIBZIP},) CFLAGS += -DHAVE_LIBZIP $(shell ${PKG_CONFIG} --cflags libzip) LIBZIP_LIBS := $(shell ${PKG_CONFIG} --libs libzip) @@ -1106,13 +1106,14 @@ signing_install: ${SIGNING_SCRIPTS} ${SIGNING_SCRIPTS_DEV} ${SIGNING_COMMON} .PHONY: futil futil: ${FUTIL_BIN} # ${FUTIL_STATIC_BIN} +FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} -${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS} ${UTILLIB21} ${FWLIB2X} ${FWLIB20} +${FUTIL_STATIC_BIN}: LDLIBS += ${FUTIL_LIBS} ${UTILLIB21} ${FWLIB2X} ${FWLIB20} ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB} ${UTILLIB21} ${FWLIB2X} ${FWLIB20} @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS} -${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS} ${FWLIB2X} ${FWLIB20} +${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS} ${FWLIB2X} ${FWLIB20} ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB2X} ${FWLIB20} @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} @@ -1155,7 +1156,7 @@ ${TEST_BINS}: LIBS = ${TESTLIB} ${UTILLIB} ${TEST_FUTIL_BINS}: ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21} ${TEST_FUTIL_BINS}: INCLUDES += -Ifutility ${TEST_FUTIL_BINS}: OBJS += ${FUTIL_OBJS} ${UTILLIB} ${UTILLIB21} -${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS} +${TEST_FUTIL_BINS}: LDLIBS += ${FUTIL_LIBS} ${TEST2X_BINS}: ${FWLIB2X} ${TEST2X_BINS}: LIBS += ${FWLIB2X} |