commit 5d94ff2ba941c681af7c6e56fcffcaba70b97419
author Hung-Te Lin <hungte@chromium.org> Tue Apr 23 16:53:01 2019 +0800
committer Hung-Te Lin <hungte@chromium.org> Tue Apr 23 09:08:04 2019 +0000
tree 22cec121b5ea848c0b84469945638fbc568a853f
parent d324ea320fa8d2eb3916bb350904be47709f92a2

tests: futility: Fix build failure due to missing libzip

The test programs do need libzip.

BUG=chromium:953993
TEST=emerge vboot_reference
BRANCH=None

Change-Id: I7347a0d192874b9eddeef4448e2d7b2d1e317fec
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1577348
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>

Makefile

diff --git a/Makefile b/Makefile
index fe46545..e3008e2 100644
--- a/Makefile
+++ b/Makefile
@@ -239,6 +239,7 @@
 ifneq (${HAVE_LIBZIP},)
   CFLAGS += -DHAVE_LIBZIP $(shell ${PKG_CONFIG} --cflags libzip)
   LIBZIP_LIBS := $(shell ${PKG_CONFIG} --libs libzip)
+  LIBZIP_STATIC_LIBS := $(shell ${PKG_CONFIG} --static --libs libzip)
 endif
 
 # Determine QEMU architecture needed, if any
@@ -1142,7 +1143,7 @@
 .PHONY: futil
 futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
 
-${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS}
+${FUTIL_STATIC_BIN}: LDLIBS += ${CRYPTO_STATIC_LIBS} ${LIBZIP_STATIC_LIBS}
 ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
 	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
@@ -1190,7 +1191,7 @@
 ${TEST_FUTIL_BINS}: ${FUTIL_OBJS} ${UTILLIB}
 ${TEST_FUTIL_BINS}: INCLUDES += -Ifutility
 ${TEST_FUTIL_BINS}: OBJS += ${FUTIL_OBJS} ${UTILLIB}
-${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS}
+${TEST_FUTIL_BINS}: LDLIBS += ${CRYPTO_LIBS} ${LIBZIP_LIBS}
 
 ${TEST2X_BINS}: ${FWLIB2X}
 ${TEST2X_BINS}: LIBS += ${FWLIB2X}