From: | "Hans de Graaff (graaff)" <graaff@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-db/mysql-workbench/files: mysql-workbench-5.2.17-python-libs.patch mysql-workbench-5.2.17-as-needed-modules.patch |
Date: | Fri, 09 Apr 2010 14:55:27 |
Message-Id: | 20100409145524.C627E2C03E@corvid.gentoo.org |
1 | graaff 10/04/09 14:55:24 |
2 | |
3 | Added: mysql-workbench-5.2.17-python-libs.patch |
4 | mysql-workbench-5.2.17-as-needed-modules.patch |
5 | Log: |
6 | More --as-needed patching in modules. This brings back the accept/discard buttons in EDIT mode. Also improve Python detection to fix compilation issues with forced --as-needed. |
7 | (Portage version: 2.1.7.17/cvs/Linux x86_64) |
8 | |
9 | Revision Changes Path |
10 | 1.1 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch |
11 | |
12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-python-libs.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: mysql-workbench-5.2.17-python-libs.patch |
16 | =================================================================== |
17 | Use a simpler check for Python's libs that return an actual linker |
18 | invocation (e.g. -lpython2.6) instead of the .so file. This fixes the |
19 | case with forced as-needed where the .so gets re-ordered to the front |
20 | during link. |
21 | |
22 | --- configure.in.~1~ 2010-04-02 03:26:27.000000000 +0200 |
23 | +++ configure.in 2010-04-09 16:06:10.271092660 +0200 |
24 | @@ -303,12 +303,7 @@ |
25 | dnl enable_python=$enableval, enable_python=no) |
26 | |
27 | AC_MSG_CHECKING(for Python) |
28 | -PYTHON_LIBS=[$(python -c "from distutils import sysconfig |
29 | -import os |
30 | -cfg=sysconfig.get_config_vars() |
31 | -lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY']) |
32 | -if os.path.exists(lib): |
33 | - print lib")] |
34 | +PYTHON_LIBS=[$(python -c 'import sys; print("-lpython%s.%s" % sys.version_info[:2])')] |
35 | PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig |
36 | print sysconfig.get_python_inc()")] |
37 | PYTHON_CFLAGS="-I$PYTHON_CFLAGS" |
38 | |
39 | |
40 | |
41 | 1.1 dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch |
42 | |
43 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/mysql-workbench/files/mysql-workbench-5.2.17-as-needed-modules.patch?rev=1.1&content-type=text/plain |
45 | |
46 | Index: mysql-workbench-5.2.17-as-needed-modules.patch |
47 | =================================================================== |
48 | --- modules/wb.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 |
49 | +++ modules/wb.validation/Makefile.am 2010-04-09 16:18:16.703343478 +0200 |
50 | @@ -19,6 +19,7 @@ |
51 | |
52 | |
53 | wb_validation_grt_la_LDFLAGS=-module |
54 | +wb_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ |
55 | #wb_mysql_import_grt_la_LIBADD=$(top_srcdir)/backend/grtdb/libgrtdbbe.la |
56 | |
57 | wb_validation_grt_la_SOURCES=src/register_plugin.cpp\ |
58 | --- modules/wb.mysql.validation/Makefile.am.~1~ 2010-04-02 03:26:24.000000000 +0200 |
59 | +++ modules/wb.mysql.validation/Makefile.am 2010-04-09 16:17:53.991717921 +0200 |
60 | @@ -21,6 +21,7 @@ |
61 | |
62 | |
63 | wb_mysql_validation_grt_la_LDFLAGS=-module |
64 | +wb_mysql_validation_grt_la_LIBADD=@GRT_LIBS@ @GLIB_LIBS@ @SIGC_LIBS@ |
65 | #wb_mysql_import_grt_la_LIBADD=$(top_srcdir) |
66 | |
67 | wb_mysql_validation_grt_la_SOURCES=src/register_plugin.cpp\ |