From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp
Date: Fri, 04 May 2012 19:43:49 +0200
Message-ID: <c19bca94a5ade9c8a528.1336153429@probook.site>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xensource.com
Cc: Ross Philipson <Ross.Philipson@citrix.com>
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# 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 <olaf@aepfle.de>

diff -r 2ef28bf88b29 -r c19bca94a5ad tools/vtpm/Makefile
--- a/tools/vtpm/Makefile
+++ b/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);
diff -r 2ef28bf88b29 -r c19bca94a5ad tools/vtpm/vtpm-0.5.1-LDLIBS.patch
--- /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/
+