From: Olaf Hering Date: Fri, 4 May 2012 17:43:25 +0000 (+0200) Subject: tools/vtpm: use LDLIBS to pass -lgmp X-Git-Tag: 4.2.0-rc1~404 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=10626831dc0e16c6b981e6c331abe0b1b96d38a6;p=xen.git tools/vtpm: use LDLIBS to pass -lgmp Linking tpmd will fail with recent toolchains because -lgmp is passed via LDFLAGS instead of LDLIBS. With this change -lgpm is placed at the end of the gcc cmdline and linking tpmd succeeds again. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile index 653505ac4b..c8a5ece6eb 100644 --- a/tools/vtpm/Makefile +++ b/tools/vtpm/Makefile @@ -50,7 +50,8 @@ $(VTPM_DIR)/tpmd/tpmd: $(TPM_EMULATOR_TARFILE) vtpm-0.5.1.patch mv $(TPM_EMULATOR_NAME) $(VTPM_DIR) set -e; cd $(VTPM_DIR); \ - patch -p1 < ../vtpm-0.5.1.patch + patch -p1 < ../vtpm-0.5.1.patch; \ + patch -p1 < ../vtpm-0.5.1-LDLIBS.patch orig: $(TPM_EMULATOR_TARFILE) mkdir $(ORIG_DIR); diff --git a/tools/vtpm/vtpm-0.5.1-LDLIBS.patch b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch new file mode 100644 index 0000000000..95586c1c5e --- /dev/null +++ b/tools/vtpm/vtpm-0.5.1-LDLIBS.patch @@ -0,0 +1,12 @@ +diff -Naurp tpm_emulator-0.5.1/tpmd/Makefile tpm_emulator-0.5.1/tpmd/Makefile +--- tpm_emulator-0.5.1/tpmd/Makefile ++++ tpm_emulator-0.5.1/tpmd/Makefile +@@ -8,7 +8,7 @@ WFLAGS := -Wall -Wno-unused -Wpointer-a + #WFLAGS += -Wextra -Wcast-qual -Wmissing-prototypes -Wmissing-declarations -Wstrict-aliasing + CFLAGS += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing + CFLAGS += -I../../../../tools/vtpm_manager/manager +-LDFLAGS += -lgmp ++LDLIBS += -lgmp + + BINDIR := /usr/bin/ +