[PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Olaf Hering]

# 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/
+ 

Re: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> tools/vtpm: use LDLIBS to pass -lgmp

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

[PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1332321236 -3600
# Node ID 6685b67958b0623064c7086e9ef6b62a0bae0f9e
# Parent  fd633b34105875ff933c15396dc7743793c133bd
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 fd633b341058 -r 6685b67958b0 tools/vtpm/vtpm-0.5.1.patch
--- a/tools/vtpm/vtpm-0.5.1.patch
+++ b/tools/vtpm/vtpm-0.5.1.patch
@@ -74,7 +74,7 @@ diff -Naurp tpm_emulator-0.5.1/tpmd/Make
             #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/sbin/
 +BINDIR  := /usr/bin/

Re: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> 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.
...
>   CFLAGS  += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing
>  +CFLAGS  += -I../../../../tools/vtpm_manager/manager
> - LDFLAGS += -lgmp
> + LDLIBS  += -lgmp
>   
>  -BINDIR  := /usr/sbin/
>  +BINDIR  := /usr/bin/

Please could you make sure not to include unrelated changes in your
patches.  That makes the job of the reviewer /much/ harder, because we
would have to inspect every hunk of your patches looking for this kind
of thing creeping in.

This is a matter of trust for us as maintainers.  Including an
unrelated hunk once can be put down to a mistake.  Doing it
persistently is a breach of the trust that we as committers need to
place in people who submit patches.

Ian.

Re: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Olaf Hering]

On Tue, Apr 03, Ian Jackson wrote:

> Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> > 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.
> ...
> >   CFLAGS  += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing
> >  +CFLAGS  += -I../../../../tools/vtpm_manager/manager
> > - LDFLAGS += -lgmp
> > + LDLIBS  += -lgmp
> >   
> >  -BINDIR  := /usr/sbin/
> >  +BINDIR  := /usr/bin/
> 
> Please could you make sure not to include unrelated changes in your
> patches.  That makes the job of the reviewer /much/ harder, because we
> would have to inspect every hunk of your patches looking for this kind
> of thing creeping in.

This patch changes a patch file for vtpm which has LDFLAGS in the
context around the changed lines.
See the space between the '-' and LDFLAGS.

Olaf

Re: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Ian Jackson]

Olaf Hering writes ("Re: [Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> On Tue, Apr 03, Ian Jackson wrote:
> 
> > Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> > > 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.
> > ...
> > >   CFLAGS  += $(WFLAGS) -g -I.. -I. -O2 -fno-strict-aliasing
> > >  +CFLAGS  += -I../../../../tools/vtpm_manager/manager
> > > - LDFLAGS += -lgmp
> > > + LDLIBS  += -lgmp
> > >   
> > >  -BINDIR  := /usr/sbin/
> > >  +BINDIR  := /usr/bin/
> > 
> > Please could you make sure not to include unrelated changes in your
> > patches.  That makes the job of the reviewer /much/ harder, because we
> > would have to inspect every hunk of your patches looking for this kind
> > of thing creeping in.
> 
> This patch changes a patch file for vtpm which has LDFLAGS in the
> context around the changed lines.
> See the space between the '-' and LDFLAGS.

Oh, god, I missed that.  Sorry.  I will apply your patch.

Ian.

Re: [PATCH] tools/vtpm: use LDLIBS to pass -lgmp

[Ian Jackson]

Olaf Hering writes ("[Xen-devel] [PATCH] tools/vtpm: use LDLIBS to pass -lgmp"):
> tools/vtpm: use LDLIBS to pass -lgmp

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>