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

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

2 files changed, 30 insertions, 0 deletions

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);