Fix building with GCC 4.5+ and -Wl,--as-needed wrt #318583 by Kacper Kowalik.

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

4 files changed, 54 insertions, 7 deletions

diff --git a/app-pda/barry/ChangeLog b/app-pda/barry/ChangeLog
index ec2c18c79e7f..893c546bc237 100644
--- a/app-pda/barry/ChangeLog
+++ b/app-pda/barry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/barry
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.12 2010/04/03 18:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/ChangeLog,v 1.13 2010/05/06 10:42:01 ssuominen Exp $
+
+  06 May 2010; Samuli Suominen <ssuominen@gentoo.org> barry-0.16.ebuild,
+  +files/barry-0.16-asneeded.patch, +files/barry-0.16-gcc45.patch:
+  Fix building with GCC 4.5+ and -Wl,--as-needed wrt #318583 by Kacper
+  Kowalik.
 
   03 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> barry-0.16.ebuild:
   Fix libtar depend from = to >=.
diff --git a/app-pda/barry/barry-0.16.ebuild b/app-pda/barry/barry-0.16.ebuild
index a366691d3d5c..7250ebbc2dd6 100644
--- a/app-pda/barry/barry-0.16.ebuild
+++ b/app-pda/barry/barry-0.16.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.4 2010/04/03 18:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/barry/barry-0.16.ebuild,v 1.5 2010/05/06 10:42:01 ssuominen Exp $
 
-inherit base
+inherit autotools base
 
 DESCRIPTION="Allow synchronization, backup, restore,
 program management, and charging for BlackBerry devices"
@@ -33,6 +33,17 @@ RDEPEND="dev-libs/libusb
 				>=dev-cpp/glibmm-2.4 )
 	opensync? ( =app-pda/libopensync-0.22* )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	)
+
+src_unpack(){
+	base_src_unpack
+	cd "${S}"
+	eautoreconf
+}
+
 src_compile(){
 	econf \
 		$(use_with boost boost =/usr/include) \
@@ -40,7 +51,8 @@ src_compile(){
 		$(use_with gui libtar =/usr/lib) \
 		$(use_with gui libz =/usr/lib) \
 		$(use_enable opensync opensync-plugin)
-	emake || die "emake failed!"
+
+	emake || die
 
 	if use doc ; then
 		cd "${S}"
@@ -49,10 +61,10 @@ src_compile(){
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die
 	if use doc; then
-		dodoc AUTHORS NEWS README || die "dodoc failed"
-		dohtml doc/www/doxygen/html/*  || die "dohtml failed"
+		dodoc AUTHORS NEWS README || die
+		dohtml doc/www/doxygen/html/*  || die
 	fi
 
 	#  udev rules
diff --git a/app-pda/barry/files/barry-0.16-asneeded.patch b/app-pda/barry/files/barry-0.16-asneeded.patch
new file mode 100644
index 000000000000..eb43780006a3
--- /dev/null
+++ b/app-pda/barry/files/barry-0.16-asneeded.patch
@@ -0,0 +1,15 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=318583
+
+--- tools/Makefile.am
++++ tools/Makefile.am
+@@ -50,7 +50,7 @@
+ bjvmdebug_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) -lpthread
+ 
+ bdptest_SOURCES = bdptest.cc
+-bdptest_LDADD = ../src/libbarrydp.la
++bdptest_LDADD = ../src/libbarry.la ../src/libbarrydp.la
+ 
+ bjdwp_SOURCES = bjdwp.cc
+ bjdwp_LDADD = ../src/libbarry.la ../src/libbarrydp.la ../src/libbarryjdwp.la
diff --git a/app-pda/barry/files/barry-0.16-gcc45.patch b/app-pda/barry/files/barry-0.16-gcc45.patch
new file mode 100644
index 000000000000..0f9be0a58fb5
--- /dev/null
+++ b/app-pda/barry/files/barry-0.16-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318583
+
+--- src/j_message.h
++++ src/j_message.h
+@@ -31,7 +31,7 @@
+ private:
+ 	int m_socket;
+ 
+-	JDWP::JDWP m_jdwp;
++	JDWP m_jdwp;
+ 
+ 	void RawSend(Barry::Data &send, int timeout = -1);
+ 	bool RawReceive(Barry::Data &receive, int timeout = -1);