~ubuntu-branches/ubuntu/utopic/mysql-cluster-7.0/utopic

« back to all changes in this revision

Viewing changes to debian/patches/44_scripts__mysql_config__libs.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-02-09 11:02:31 UTC
  • Revision ID: james.westby@ubuntu.com-20100209110231-5td5ofj12nrmpjpi
Tags: 7.0.9-1
Initial release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## 99-unnamed.dpatch by  <ch@debian.org>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: Removes unnecessary library dependencies. See #390692
 
6
 
 
7
@DPATCH@
 
8
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
 
9
--- mysql-dfsg-5.1-5.1.31.orig/scripts/mysql_config.sh  2009-01-19 17:30:55.000000000 +0100
 
10
+++ mysql-dfsg-5.1-5.1.31/scripts/mysql_config.sh       2009-02-08 17:17:48.000000000 +0100
 
11
@@ -104,10 +104,10 @@
 
12
 
 
13
 # Create options 
 
14
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
 
15
-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 
16
+libs=" $ldflags -L$pkglibdir -lmysqlclient"
 
17
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
 
18
-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
 
19
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
20
+libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @openssl_libs@ "
 
21
+embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
 
22
 
 
23
 if [ -r "$pkglibdir/libmygcc.a" ]; then
 
24
   # When linking against the static library with a different version of GCC