Fix linking with -Wl,--as-needed, bug 306387, thanks to Bjoern Thorwirth <Bjoern.Thorwirth@uni-due.de>.

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

5 files changed, 48 insertions, 26 deletions

diff --git a/dev-db/mysql-workbench/ChangeLog b/dev-db/mysql-workbench/ChangeLog
index b3cccd57a5e4..e1c69dd9245a 100644
--- a/dev-db/mysql-workbench/ChangeLog
+++ b/dev-db/mysql-workbench/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-workbench
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.4 2010/02/17 19:34:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/ChangeLog,v 1.5 2010/02/24 17:36:13 idl0r Exp $
+
+  24 Feb 2010; Christian Ruppert <idl0r@gentoo.org>
+  mysql-workbench-5.2.15.ebuild, mysql-workbench-5.2.16.ebuild,
+  +files/mysql-workbench-5.2.16-asneeded.patch:
+  Fix linking with -Wl,--as-needed, bug 306387, thanks to Bjoern Thorwirth
+  <Bjoern.Thorwirth@uni-due.de>.
 
 *mysql-workbench-5.2.16 (17 Feb 2010)
 
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch
deleted file mode 100644
index 278a0df1ec8a..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-5.2.15-as-needed.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- library/base/src/Makefile.am.~1~	2009-12-17 20:30:22.000000000 +0100
-+++ library/base/src/Makefile.am	2009-12-26 15:11:38.347093031 +0100
-@@ -6,6 +6,7 @@
- 
- INCLUDES= -Wall -Wsign-compare\
-         @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
-+LIBS= @PCRE_LIBS@
- 
- libwbbase_la_SOURCES=util.c\
- 	util_functions.c\
---- backend/wbpublic/Makefile.am.~1~	2009-12-17 20:30:13.000000000 +0100
-+++ backend/wbpublic/Makefile.am	2009-12-26 15:33:27.795967633 +0100
-@@ -20,6 +20,8 @@
- 	-I$(top_srcdir)/modules\
- 	-I$(top_srcdir)/ext/ctemplate/ctemplate-src/src
- 
-+LIBS= @CTEMPLATE_LIBS@
-+
- libwbpublic_la_SOURCES=\
- 	grt/refresh_ui.cpp\
- 	grt/editor_base.cpp\
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch b/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch
new file mode 100644
index 000000000000..156e71713951
--- /dev/null
+++ b/dev-db/mysql-workbench/files/mysql-workbench-5.2.16-asneeded.patch
@@ -0,0 +1,37 @@
+--- mysql-workbench-oss-5.2.16.orig/library/base/src/Makefile.am	2010-02-16 20:29:55.000000000 +0100
++++ mysql-workbench-oss-5.2.16/library/base/src/Makefile.am	2010-02-24 17:34:07.401777509 +0100
+@@ -7,6 +7,9 @@ pkglib_LTLIBRARIES = libwbbase.la
+ INCLUDES= -Wall -Wsign-compare\
+         @MYSQL_INCLUDE@ @GLIB_CFLAGS@ @PCRE_CFLAGS@ @SIGC_CFLAGS@
+ 
++libwbbase_la_LIBADD=@GLIB_LIBS@\
++					@PCRE_LIBS@
++
+ libwbbase_la_SOURCES=util.c\
+ 	util_functions.c\
+ 	xml_util_functions.c\
+--- mysql-workbench-oss-5.2.16.orig/backend/wbpublic/Makefile.am	2010-02-16 20:29:46.000000000 +0100
++++ mysql-workbench-oss-5.2.16/backend/wbpublic/Makefile.am	2010-02-24 17:47:05.623513994 +0100
+@@ -145,4 +145,4 @@ libwbpublic_la_SOURCES=\
+ 	grtui/checkbox_list_control.cpp\
+   grtui/file_charset_dialog.cpp
+ 
+-libwbpublic_la_LIBADD=../../library/canvas/src/libmdcanvas.la ../../library/forms/libmforms.la ../../library/dbc/libcdbc.la ../../library/vsqlite++/src/sqlite/libvsqlitepp.la
++libwbpublic_la_LIBADD=../../library/canvas/src/libmdcanvas.la ../../library/forms/libmforms.la ../../library/dbc/libcdbc.la ../../library/vsqlite++/src/sqlite/libvsqlitepp.la @CTEMPLATE_LIBS@
+--- mysql-workbench-oss-5.2.16.orig/library/grt/src/Makefile.am	2010-02-16 20:29:56.000000000 +0100
++++ mysql-workbench-oss-5.2.16/library/grt/src/Makefile.am	2010-02-24 17:33:32.341520830 +0100
+@@ -13,9 +13,11 @@ INCLUDES=-I. -I.. @GLIB_CFLAGS@ @SIGC_CF
+ 	@GRT_CFLAGS@
+ 
+ libgrt_la_LIBADD=\
+-        @LUA_LIBS@\
+-        $(top_srcdir)/library/base/src/libwbbase.la
+-
++		@LUA_LIBS@\
++		@GLIB_LIBS@\
++		@SIGC_LIBS@\
++		$(top_srcdir)/library/base/src/libwbbase.la
++        
+ libgrt_la_SOURCES=\
+ 	grtpp_grt.cpp\
+ 	grtpp_helper.cpp\
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
index 97010e5ddadf..b6113270180a 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild,v 1.3 2010/02/17 17:12:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.15.ebuild,v 1.4 2010/02/24 17:36:13 idl0r Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -47,7 +47,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-configure.in.pythonlib.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-5.2.16-asneeded.patch"
 	eautoreconf
 }
 
diff --git a/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild b/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
index 25a549d4bdc1..a04d26638ac5 100644
--- a/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild,v 1.1 2010/02/17 19:34:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-5.2.16.ebuild,v 1.2 2010/02/24 17:36:13 idl0r Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -47,7 +47,7 @@ S="${WORKDIR}"/"${MY_P}"
 
 src_prepare() {
 	epatch "${FILESDIR}/mysql-workbench-5.2.15-configure.in.pythonlib.patch"
-	epatch "${FILESDIR}/mysql-workbench-5.2.15-as-needed.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
 	eautoreconf
 }