Fix building with -Wl,--as-needed wrt #285305, thanks to Kacper Kowalik.

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

4 files changed, 72 insertions, 10 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 2595f1484091..6a19ae44dedf 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,14 +1,15 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.80 2009/11/18 16:38:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.81 2009/11/18 17:36:35 ssuominen Exp $
+
+  18 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #285305, thanks to Kacper Kowalik.
 
   18 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   heartbeat-2.0.8.ebuild, +files/heartbeat-2.0.8-glibc.patch:
   Non-maintainer commit. Fix building with _FORTIFY_SOURCE=2 and recent
-  gnutls wrt #285305. The bug has also -Wl,--as-needed patch which should be
-  applied to Makefile.am instead of Makefile.in, so leaving it out, instead
-  using append-ldflags $(no-as-needed) so that we have something that
-  actually compiles.
+  gnutls wrt #285305.
 
   27 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   heartbeat-2.0.8.ebuild:
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 8bfec51906af..5b216031043a 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,4 +1,5 @@
 AUX heartbeat-2.0.7-update-resources-failcount.patch 6648 RMD160 71e59accbad7883af4dae8d129ff15cdb59105fc SHA1 cc644a7d69c3d999bc440083723951cce1011b67 SHA256 0a08f4e45037724a3cc0877a16452d351535cee2d43dcb4a4bbd47c6c9ab7f3f
+AUX heartbeat-2.0.8-asneeded.patch 2605 RMD160 ba2280ad11d37d123d1a7310cb23e55911aa14b1 SHA1 a864ead82e18c9a7722aa5021e11b7c951abebd0 SHA256 669b0b63c7f5b53671f110d33a0922e1b89fa3ceb6ae1fb44f4a674375778231
 AUX heartbeat-2.0.8-crm-leaks.patch 16011 RMD160 f5cd30e246a36329d2fb81d798c0c07b21a71645 SHA1 583882aa32fe4168392699dfefc03557a11af5da SHA256 559d192f47de95288d7a09c4d669801b623ab47b1ad39104ddde6d2d86b9bba0
 AUX heartbeat-2.0.8-delay.patch 328 RMD160 fa5b28027ee1ddaed4b3938326bf33ea156b1b6e SHA1 ec5f8f59390644e12c6f1f93e96871a6887f1596 SHA256 65afacc1a2b73170cd0167cee14eb280128de1dbcb5c59249d40be81737c024c
 AUX heartbeat-2.0.8-glibc.patch 532 RMD160 16e4fff7ccb75ac06c804998a8e92d4576dfee50 SHA1 183a7018eeef4c08187b9e858bda20f5312180de SHA256 786b9e86d7f6917f11bcbe0ee2a18a908ee2bae70fd3276c39540992677227ca
@@ -9,6 +10,6 @@ DIST heartbeat-2.0.8.tar.gz 3502095 RMD160 76f3a56cbbafac8c35a87266b73d46a86de86
 EBUILD heartbeat-1.2.5-r1.ebuild 2036 RMD160 336e598ab184b9c95b24e245335f953c165bf7f7 SHA1 cb2764a5835505ba5ad98e34cb491a5c301d491d SHA256 51904a81903cccdefb8f1f53ead233ebdb71f15d1251b60b5fc5dd266606fb90
 EBUILD heartbeat-1.2.5.ebuild 1986 RMD160 c42f9d01c43438c765bf4ef878d15cd1bbc39e0f SHA1 51b01db70e00ff119522f98df1548ef2045729e1 SHA256 0e8cf23a0b470931879f48ec67f30a4b36dd51802165f2e868cbcbd2bf56dcde
 EBUILD heartbeat-2.0.7-r2.ebuild 3565 RMD160 2275d514ffee4b55d200316f5dcb67221f11061c SHA1 d728b403714f8344a8e4b87eff07865563b75aba SHA256 6f8523742df6c27727fc36965e5a174ccb9a7c190f524aae37f40426f58bf6a3
-EBUILD heartbeat-2.0.8.ebuild 3987 RMD160 2c7b56fb01d0226e84d328a4a6e667f4f5dee1d3 SHA1 e8a817727eff15e487a7fd42f49d093899d6eca0 SHA256 e10dd8310f540c262c9120761f8dbd578efbed203edf720b95250fe806d23ff3
-MISC ChangeLog 13125 RMD160 d33c759e597c158a2efb169bc8e487cf401ca702 SHA1 ac99040802d56c2f567c49d9fb64b6b265caf411 SHA256 24fe8c8461f215d6842576ed11397c90b73a4557b1d90d1b99635959e60acfdb
+EBUILD heartbeat-2.0.8.ebuild 3971 RMD160 3403af471ac7da9a9656ad77faa9064c70b91190 SHA1 07ffcba570f0bf7dc4909477da0296880c4c82f4 SHA256 afc6d36d4503dd5bcc1a0c26522ad6bb3337d3e91eadf52c0761c5e53191f90c
+MISC ChangeLog 13098 RMD160 35aef3d73cede52bb2154361db423b762a135035 SHA1 2165aac7efef5f8c21b27f436c53b89ab2345eae SHA256 e2171830cd5bda96cd935250523dac08f5944fcc391c31f0356f6c0d42001acc
 MISC metadata.xml 533 RMD160 7e69dc1ae8397093dcc3ae717e578ae1cb0b522d SHA1 cf5d6f65fc453d8f99951cb853c1783ca22c62ee SHA256 8d29fb1d7f036f812707240c5d68cda93a2ccc6bf59c70625a7685597e1325ae
diff --git a/sys-cluster/heartbeat/files/heartbeat-2.0.8-asneeded.patch b/sys-cluster/heartbeat/files/heartbeat-2.0.8-asneeded.patch
new file mode 100644
index 000000000000..119d236c2eaa
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-2.0.8-asneeded.patch
@@ -0,0 +1,61 @@
+--- heartbeat-2.0.8.orig/membership/ccm/Makefile.am	2007-01-12 03:57:08.000000000 +0100
++++ heartbeat-2.0.8/membership/ccm/Makefile.am	2009-11-18 18:06:29.402999800 +0100
+@@ -89,6 +89,7 @@
+ 
+ libccmclient_la_SOURCES	= ccmlib_memapi.c ccmlib_eventapi.c ccmlib.h
+ libccmclient_la_LDFLAGS	= -version-info 1:0:0
++libccmclient_la_LIBADD = $(top_builddir)/lib/clplumbing/libplumb.la
+ 
+ 
+ ## library libclm.la
+@@ -102,6 +103,7 @@
+ ## Add -DPOSIX_THREADS to CFLAGS to compile a thread-safe version library
+ libclm_la_CFLAGS	= -DHA_VARLIBDIR='"@HA_VARLIBDIR@"' -g #-DPOSIX_THREADS
+ libclm_la_LDFLAGS	= -version-info 1:0:0
++libclm_la_LIBADD = $(gliblib) ./libccmclient.la
+ 
+ clmtest_SOURCES		= clmtest.c
+ clmtest_LDADD		= libclm.la libccmclient.la \
+--- heartbeat-2.0.8.orig/lib/crm/common/Makefile.am	2007-01-12 03:57:08.000000000 +0100
++++ heartbeat-2.0.8/lib/crm/common/Makefile.am	2009-11-18 18:07:11.829252027 +0100
+@@ -41,6 +41,7 @@
+ libcrmcommon_la_SOURCES	= ipc.c msg.c utils.c xml.c ctrl.c \
+ 			iso8601.c iso8601_fields.c
+ libcrmcommon_la_LDFLAGS	= -version-info 1:1:0
++libcrmcommon_la_LIBADD = $(gliblib) $(top_builddir)/lib/clplumbing/libplumb.la
+ 
+ clean-generic:
+ 	rm -f *.log *.debug *.xml *~
+--- heartbeat-2.0.8.orig/crm/pengine/Makefile.am	2007-01-12 03:57:04.000000000 +0100
++++ heartbeat-2.0.8/crm/pengine/Makefile.am	2009-11-18 18:07:44.928999529 +0100
+@@ -63,6 +63,9 @@
+ # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version 
+ libpengine_la_SOURCES	= pengine.c allocate.c utils.c \
+ 			native.c group.c clone.c master.c graph.c
++libpengine_la_LIBADD = $(top_builddir)/lib/crm/pengine/libpe_rules.la \
++        $(top_builddir)/lib/crm/pengine/libpe_status.la
++
+ 
+ pengine_SOURCES	= main.c
+ pengine_CFLAGS	= -DHA_VARLIBDIR='"@HA_VARLIBDIR@"'
+--- heartbeat-2.0.8.orig/lib/crm/pengine/Makefile.am	2007-01-12 03:57:08.000000000 +0100
++++ heartbeat-2.0.8/lib/crm/pengine/Makefile.am	2009-11-18 18:08:21.715999508 +0100
+@@ -60,6 +60,8 @@
+ 
+ libpe_status_la_LDFLAGS	= -version-info 1:0:0
+ libpe_status_la_SOURCES	=  $(rule_files) $(status_files)
++libpe_status_la_LIBADD = -lncurses \
++	$(top_builddir)/lib/crm/cib/libcib.la
+ 
+ clean-generic:
+ 	rm -f *.log *.debug *~
+--- heartbeat-2.0.8.orig/lib/crm/Makefile.am	2007-01-12 03:57:08.000000000 +0100
++++ heartbeat-2.0.8/lib/crm/Makefile.am	2009-11-18 18:08:42.514251905 +0100
+@@ -18,5 +18,5 @@
+ MAINTAINERCLEANFILES    = Makefile.in
+ 
+ ## Subdirectories...
+-SUBDIRS		= common pengine cib transition
+-DIST_SUBDIRS	= common pengine cib transition
++SUBDIRS		= common cib pengine transition
++DIST_SUBDIRS	= common cib pengine transition
diff --git a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
index 15be1ef9a2ec..c0c191794989 100644
--- a/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.16 2009/11/18 16:38:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-2.0.8.ebuild,v 1.17 2009/11/18 17:36:35 ssuominen Exp $
 
 inherit autotools flag-o-matic eutils
 
@@ -51,6 +51,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-crm-leaks.patch
 	epatch "${FILESDIR}"/${P}-delay.patch
 	epatch "${FILESDIR}"/${P}-glibc.patch
+	epatch "${FILESDIR}"/${P}-asneeded.patch
 	sed -i \
 		-e 's:libgnutls-config:pkg-config gnutls:g' \
 		lib/mgmt/Makefile.am \
@@ -63,8 +64,6 @@ src_unpack() {
 }
 
 src_compile() {
-	# FIXME. See bug 285305.
-	append-ldflags $(no-as-needed)
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \