[Pkg-mysql-commits] r1406 - branches/sid-5.1/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2009-02-08 16:18:29 +0000 (Sun, 08 Feb 2009)
New Revision: 1406

Modified:
   branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch
Log:
Update 44_scripts__mysql_config__libs.dpatch

Modified: branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch	2009-02-08 16:07:38 UTC (rev 1405)
+++ branches/sid-5.1/debian/patches/44_scripts__mysql_config__libs.dpatch	2009-02-08 16:18:29 UTC (rev 1406)
@@ -5,10 +5,10 @@
 ## DP: Removes unnecessary library dependencies. See #390692
 
 @DPATCH@
-
---- old/scripts/mysql_config.sh	2006-08-25 23:12:10.000000000 +0200
-+++ new/scripts/mysql_config.sh	2006-10-02 21:05:52.000000000 +0200
-@@ -98,10 +98,10 @@
+diff -Nur mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh
+--- mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh  2009-01-19 17:30:55.000000000 +0100
++++ mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh       2009-02-08 17:17:48.000000000 +0100
+@@ -104,10 +104,10 @@
  
  # Create options 
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
@@ -16,9 +16,9 @@
 +libs=" $ldflags -L$pkglibdir -lmysqlclient"
  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@ "
+-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @openssl_libs@ "
-+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
++embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
  
- cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
- include="-I$pkgincludedir"
+ if [ -r "$pkglibdir/libmygcc.a" ]; then
+   # When linking against the static library with a different version of GCC