diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-05-04 19:43:25 +0200 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-05-04 19:43:25 +0200 |
| commit | 10626831dc0e16c6b981e6c331abe0b1b96d38a6 (patch) | |
| tree | 944cee817cadadbc2e3e5de6846f9cb0cc5a29ea /tools/vtpm | |
| parent | b1c2cf9846457f620756050074022928a1bbf81d (diff) | |
| download | xen-10626831dc0e16c6b981e6c331abe0b1b96d38a6.tar.gz xen-10626831dc0e16c6b981e6c331abe0b1b96d38a6.tar.bz2 xen-10626831dc0e16c6b981e6c331abe0b1b96d38a6.zip | |
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>
Diffstat (limited to 'tools/vtpm')
| -rw-r--r-- | tools/vtpm/Makefile | 3 | ||||
| -rw-r--r-- | tools/vtpm/vtpm-0.5.1-LDLIBS.patch | 12 |
2 files changed, 14 insertions, 1 deletions
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/ + |