Bug #332905: Fix compile for static/export-dynamic together.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 78 insertions, 14 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 3d47c38f7c4a..bfb988dede4d 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.222 2010/08/13 13:29:37 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.223 2010/08/17 18:44:22 robbat2 Exp $
+
+  17 Aug 2010; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.72.ebuild,
+  +files/lvm2-2.02.72-dynamic-static-ldflags.patch:
+  Bug #332905: Fix compile for static/export-dynamic together.
 
   13 Aug 2010; Joseph Jezak <josejx@gentoo.org> lvm2-2.02.67-r2.ebuild:
   Marked ppc/ppc64 stable for bug #324485.
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 39be645dca63..07b3e3309dfb 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
 AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
@@ -46,6 +43,7 @@ AUX lvm2-2.02.64-dmeventd-libs.patch 618 RMD160 c030db2d971e0287fa9c65ab9bede919
 AUX lvm2-2.02.67-createinitrd.patch 660 RMD160 8d95b2fdbc8d3eb9e173fd5326d78b78968ef8a2 SHA1 a6c86564cfd17452af8766f4b70c55c8cbcf8bdf SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39
 AUX lvm2-2.02.70-asneeded.patch 326 RMD160 725f7705903d4cc9ba94c8b1c8f76905ec3d9832 SHA1 3332b8671a31f255626299af894d89b0a972c4c4 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e
 AUX lvm2-2.02.70-locale-muck.patch 477 RMD160 60d3e1f1e49c6f27a20a0a0b6962d0791b236657 SHA1 99974c59b58572e367fc82bca18d317a28045a1e SHA256 95d92e13ca1c926ff6da2b10bf12da63555a21463bb2f8118c722a7394ca5e13
+AUX lvm2-2.02.72-dynamic-static-ldflags.patch 2912 RMD160 37a8b4261e63885e52fc82e4a42892cd299480d9 SHA1 ff4b6d6040a52b5d877f664f1e7c56d99f36d9c9 SHA256 536f57d7860ea078a4cc7f025d86c3b37befe2db9df7802d58b506bbeefa79d8
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-start.sh-2.02.49-r1 1200 RMD160 b88e37e7e228fecdedf359c1132723077a3d4c94 SHA1 85eb83a83c598b3ea405ec4c597a9c77364e7fb4 SHA256 94d15b5dbeabb275b4d91b284b3113cd812b7e7c90ec3018693803b3e91d9535
@@ -106,13 +104,6 @@ EBUILD lvm2-2.02.67-r2.ebuild 8330 RMD160 441a16affe6763f996bdeb8bdb7bc03fa37e27
 EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f SHA1 bac7dbfc373755a7ff3e1ac99196e0088f2e3901 SHA256 3d6d8b185354003c610216cdfd0390b8b951387e9ab31b6c6a2b1dd37c857730
 EBUILD lvm2-2.02.70-r1.ebuild 8470 RMD160 7c11815d265b3303750b7046a4125dd34e1cd5f9 SHA1 550847924c0162a852bf6cbd94e836fcadb21213 SHA256 478ee7870d4ef032ee835bcd473358773e57ee652b90827c8737eec5af812833
 EBUILD lvm2-2.02.70.ebuild 8401 RMD160 3493a62e42f11e3afc16ed8f2c185c9885f6c811 SHA1 9bc476b6f607c6bac0263202dc6a7dbb5d06fee9 SHA256 83a2c5435ec9f38dfc2ef053471654b09788f3f492649667b1a2f319a87e5989
-EBUILD lvm2-2.02.72.ebuild 8467 RMD160 041f280aa257dbc627272b41557444c21bd36044 SHA1 2a60c84f568e648b685906a68c7935299f69ff88 SHA256 80ed86ee5536a70958c12d26415a7e01bce9525a5a2ed4c9d2a6657f583faecc
-MISC ChangeLog 40086 RMD160 91c771db66325f448cf202a1551f2aa35c0bc9e5 SHA1 e29faf527314e0de6dd4212693b732e6e041db95 SHA256 9a4acebf96e507142770194b30cb02a07c78152bc6165e1dc8c45d6a065d55e8
+EBUILD lvm2-2.02.72.ebuild 8546 RMD160 bba26a2bd24e510e41e4fef27da9963e4b991c0f SHA1 5b532aa7c791224964369852d1072effbe5b83a7 SHA256 4f7ff2f71b70a3740a8f9533c72a812868dddd03eaf914d880a8cf9ed2f44293
+MISC ChangeLog 40277 RMD160 3851b5e65c28a5ddab6950164dec746055be246c SHA1 0e3ab225afbfbd002a89a7793e03daab2b5ac5da SHA256 1329dc020553660c3aa2fc90b90a8e61fb21c841963922c5ce180e4020dbd403
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxlSG8ACgkQcsIHjyDViGRL/wCffPqBGiiC20gBztKGkVDJ19AJ
-nbQAn0LwWmrCSAThvZ7J3pvo9UYGHebv
-=hd0y
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.72-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.72-dynamic-static-ldflags.patch
new file mode 100644
index 000000000000..f1824b1abfb7
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.72-dynamic-static-ldflags.patch
@@ -0,0 +1,67 @@
+X-Gentoo-Bug: 332905
+X-Patch-URL: https://bugs.gentoo.org/attachment.cgi?id=243283&action=view
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=332905
+
+diff -ur LVM2.2.02.72.orig/configure.in LVM2.2.02.72/configure.in
+--- LVM2.2.02.72.orig/configure.in	2010-07-28 16:55:42.000000000 +0300
++++ LVM2.2.02.72/configure.in	2010-08-17 03:00:24.000000000 +0300
+@@ -35,6 +35,7 @@
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+ 		LDDEPS="$LDDEPS .export.sym"
+ 		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
++		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
+ 		LIB_SUFFIX=so
+ 		DEVMAPPER=yes
+ 		ODIRECT=yes
+@@ -1282,6 +1283,7 @@
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
++AC_SUBST(STATIC_LDFLAGS)
+ AC_SUBST(STATIC_LINK)
+ AC_SUBST(TESTING)
+ AC_SUBST(UDEV_LIBS)
+diff -ur LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in LVM2.2.02.72/daemons/dmeventd/Makefile.in
+--- LVM2.2.02.72.orig/daemons/dmeventd/Makefile.in	2010-05-14 16:36:56.000000000 +0300
++++ LVM2.2.02.72/daemons/dmeventd/Makefile.in	2010-08-17 03:00:24.000000000 +0300
+@@ -61,7 +61,7 @@
+ 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
+ 
+ dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
+ 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+diff -ur LVM2.2.02.72.orig/make.tmpl.in LVM2.2.02.72/make.tmpl.in
+--- LVM2.2.02.72.orig/make.tmpl.in	2010-07-20 17:38:44.000000000 +0300
++++ LVM2.2.02.72/make.tmpl.in	2010-08-17 03:00:24.000000000 +0300
+@@ -38,6 +38,7 @@
+ CLDFLAGS += @CLDFLAGS@
+ LDDEPS += @LDDEPS@
+ LDFLAGS += @LDFLAGS@
++STATIC_LDFLAGS += @STATIC_LDFLAGS@
+ LIB_SUFFIX = @LIB_SUFFIX@
+ LVMINTERNAL_LIBS = -llvm-internal $(DL_LIBS)
+ DL_LIBS = @DL_LIBS@
+diff -ur LVM2.2.02.72.orig/tools/Makefile.in LVM2.2.02.72/tools/Makefile.in
+--- LVM2.2.02.72.orig/tools/Makefile.in	2010-06-25 21:23:10.000000000 +0300
++++ LVM2.2.02.72/tools/Makefile.in	2010-08-17 03:01:07.000000000 +0300
+@@ -126,7 +126,7 @@
+ 	      -o $@ dmsetup.o -ldevmapper $(LIBS)
+ 
+ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
+ 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
+ 
+ all: device-mapper
+@@ -136,7 +136,7 @@
+ 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
+ 
+ lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
+ 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
+ 
+ liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lvm2/lvm2-2.02.72.ebuild b/sys-fs/lvm2/lvm2-2.02.72.ebuild
index e293fc564bdd..c98322f7957a 100644
--- a/sys-fs/lvm2/lvm2-2.02.72.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.72.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.72.ebuild,v 1.2 2010/08/04 07:56:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.72.ebuild,v 1.3 2010/08/17 18:44:22 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -76,6 +76,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.70-locale-muck.patch
 	# --as-needed
 	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
 
 	eautoreconf
 }