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

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

5 files changed, 58 insertions, 9 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/Manifest b/app-pda/barry/Manifest
index 246d77457a01..e032b4cc47a4 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,6 +1,8 @@
 AUX 10-blackberry.rules 1983 RMD160 bea10908beef0558402b8a8888ebc0ea4e561562 SHA1 c94747478a616c67cd115662c7a5bb4ad6220611 SHA256 26d15257fc5f48089a1b8559e7ac93101bdbc4434e409214c67dda130f05159a
+AUX barry-0.16-asneeded.patch 430 RMD160 5cd87c872beac14746adef2ae875f8ae83d4296f SHA1 630c2cd645d261b1dbe583c81f4fa79c177b770c SHA256 9ff407b9507297cd25b676e4b92c94ded5d7955b47816f7985fbcbfbeda0581b
+AUX barry-0.16-gcc45.patch 310 RMD160 42a67dc4baba475a1ef0352d2efc842d21cfaf7a SHA1 3247f8f102e8e5a72be89206df0891b641ebaa1a SHA256 f341443d2de4a229eeed8409ccd7e52d3ce8cb3dc3ab5607f69657a3472785f6
 AUX blacklist-berry_charge.conf 65 RMD160 5fbc61819a71cb266a93053c99d32ea2424c5683 SHA1 5320c555ecd5b844bb4db5a238538abc472b2516 SHA256 26003dcfdf7da0a677cbc72e01615fc694ccd2e884269da9a22d722f7549386e
 DIST barry-0.16.tar.bz2 4981342 RMD160 407d1ae1d4c42a589093bd2cc4ad791f230ab23c SHA1 011b1f42c3832f30942744dc8f577dc0eaf2189c SHA256 60f0055399a6d97445e069b804bcc8a1c60f5fc999fcec385dcd4484990ec220
-EBUILD barry-0.16.ebuild 2338 RMD160 fcd2678daf93e5e1c87b6a451e28702aa769ee1a SHA1 17e370ce0c5c3167165cb059bbe70669026f2ce6 SHA256 0bfb676edb3ae40a5fbc9e74a2aea179ee18b7e9fbf6f36c68fb6f8dfb64f02e
-MISC ChangeLog 2283 RMD160 2c97fe877505357e096346fbd0eb977e8be0228b SHA1 eb6e409cdb8e6b450d0acae1ffd0739ad47d20d9 SHA256 8743dc1cae71bf445dc384a95a0c9623e75c335e9ab128b776b848e360a6bb21
+EBUILD barry-0.16.ebuild 2424 RMD160 0ea86254a97aa3f03573457f856ebf69b8782a68 SHA1 e79820e530f6fbcf8b898ddc20a9038befa95643 SHA256 a2d5a4185c5855f816940ebdc40a0b4d7a779cebf29165463266e7f975a451c7
+MISC ChangeLog 2506 RMD160 ea44e0983d1854f0df74f3bffa4c4959a71fc5fe SHA1 544a4f46f1a6b4db0910eb69c87424bba94d7223 SHA256 94220186d25d8965027f2b824417662e6a9e476c2608e888e6e6e96a2c22ebd2
 MISC metadata.xml 527 RMD160 0b26a71d2d7c281f28003befd27c26e22ff2aa81 SHA1 81ae6b95703926b438a9b9688430aee3e5d3f70e SHA256 5366935efc2f4074c1bd55bd309abbc4d373f29bca70c778e45ded785381dfab
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);