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 <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

diff --git a/tools/vtpm/Makefile b/tools/vtpm/Makefile
index 653505ac4b390592709194578879aa21c051afe0..c8a5ece6eb040921fdb8794517d38d0c1a64c849 100644 (file)
--- 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 (file)
index 0000000..95586c1
--- /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/
+