diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2009-07-06 11:25:58 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2009-07-06 11:25:58 -0700 |
| commit | 40d5248ec0f0088463f742ceea9080177b2a244a (patch) | |
| tree | 573ecfad1c31467565f96d0d563e095ba3ca35b4 | |
| parent | Reorder the index file for ease of use. (diff) | |
| download | mysql-extras-20090706-1838Z.tar.gz mysql-extras-20090706-1838Z.tar.bz2 mysql-extras-20090706-1838Z.zip | |
as-needed fix from bug #253917.mysql-extras-20090706-1838Z
| -rw-r--r-- | 00000_index.txt | 6 | ||||
| -rw-r--r-- | 07240_all_as-needed-config-5.0.76.patch | 43 |
2 files changed, 49 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt index 1f3bb53..bbea70a 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -501,6 +501,12 @@ @pn mysql-community @@ Prevent SIGBUS on Sparc with NDB +@patch 07240_all_as-needed-config-5.0.76.patch +@ver 5.00.76.00 to 5.00.99.99 +@pn mysql +@pn mysql-community +@@ Fix LDFLAGS inclusion in the mysql_config libs output for --as-needed usage. + @patch 10010_all_show_patches-percona-5.0.75-b12.patch @ver 5.00.75.00 to 5.00.76.99 @pn mysql-community diff --git a/07240_all_as-needed-config-5.0.76.patch b/07240_all_as-needed-config-5.0.76.patch new file mode 100644 index 0000000..709a0bd --- /dev/null +++ b/07240_all_as-needed-config-5.0.76.patch @@ -0,0 +1,43 @@ +Fix LDFLAGS inclusion in the mysql_config libs output for --as-needed usage. + +X-Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=182078&action=view +Gentoo-Bug: 253917 +Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=253917 + +diff --git a/scripts/mysql_config.pl.in b/scripts/mysql_config.pl.in +index 3ae8baf..a7e8d57 100644 +--- a/scripts/mysql_config.pl.in ++++ b/scripts/mysql_config.pl.in +@@ -198,11 +198,11 @@ else + + my $flags; + $flags->{libs} = +- [@ldflags,@lib_opts,'@ZLIB_DEPS@','@NON_THREADED_LIBS@','@openssl_libs@','@STATIC_NSS_FLAGS@']; ++ [@lib_opts,'@ZLIB_DEPS@','@NON_THREADED_LIBS@','@openssl_libs@','@STATIC_NSS_FLAGS@']; + $flags->{libs_r} = +- [@ldflags,@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@']; ++ [@lib_r_opts,'@ZLIB_DEPS@','@LIBS@','@openssl_libs@']; + $flags->{embedded_libs} = +- [@ldflags,@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@']; ++ [@lib_e_opts,'@ZLIB_DEPS@','@LIBS@','@WRAPLIBS@','@innodb_system_libs@','@openssl_libs@']; + + $flags->{include} = ["-I$pkgincludedir"]; + $flags->{cflags} = [@{$flags->{include}},split(" ",'@CFLAGS@')]; +diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh +index 915f623..8f85a37 100644 +--- a/scripts/mysql_config.sh ++++ b/scripts/mysql_config.sh +@@ -102,10 +102,10 @@ fi + + # Create options + # We intentionally add a space to the beginning and end of lib strings, simplifies replace later +-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" ++libs=" -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" + libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " +-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " +-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " ++libs_r=" -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ " ++embedded_libs=" -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ " + + if [ -r "$pkglibdir/libmygcc.a" ]; then + # When linking against the static library with a different version of GCC |