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

(Portage version: 2.2_rc49/cvs/Linux x86_64)

3 files changed, 69 insertions, 8 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/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 \