Skip to contentSkip to conversation

tools/vtpm: use LDLIBS to pass -lgmp

PATCH In review Olaf Hering 2 participants 2 messages May 4, 2012 – May 10, 2012

lore
Share & tools
lore

Olaf Hering

author
#0 lore raw

PATCH 1/1 tools/vtpm: use LDLIBS to pass -lgmp

# HG changeset patch
# User Olaf Hering <[email protected]>
# Date 1336153405 -7200
# Node ID c19bca94a5ade9c8a528f346bce3c90eee319306 # Parent 2ef28bf88b290d01ca92581dcd68f1aa32017e4e 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 <[email protected]>
tools/vtpm/Makefile +2 -1
diff -r 2ef28bf88b29 -r c19bca94a5ad tools/vtpm/Makefile
@@ -50,7 +50,8 @@ mrproper:
 	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);
tools/vtpm/vtpm-0.5.1-LDLIBS.patch new file +12 -0
diff -r 2ef28bf88b29 -r c19bca94a5ad 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/
+