Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-client/files/patch-scripts_mysql_config.sh
--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 | --- scripts/mysql_config.sh.orig 2016-01-14 20:12:38 UTC | ||||
+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 | +++ scripts/mysql_config.sh | ||||
@@ -108,8 +108,11 @@ | @@ -106,7 +106,9 @@ fi | ||||
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later | |||||
libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" | |||||
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " | |||||
+libs="$libs -L%%LOCALBASE%%/lib " | |||||
libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " | |||||
+libs_r="$libs_r -L%%LOCALBASE%%/lib " | |||||
embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " | |||||
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " | |||||
if [ -r "$pkglibdir/libmygcc.a" ]; then | # Create options | ||||
# When linking against the static library with a different version of GCC | libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" | ||||
brnrd: Fixed | |||||
+libs="$libs -L/usr/local/lib " | |||||
Done Inline ActionsWas changing this from: +libs="$libs -L%%LOCALBASE%%/lib" +libs_r="$libs_r -L%%LOCALBASE%%/lib" +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib" intentional? koobs: Was changing this from:
```
+libs="$libs -L%%LOCALBASE%%/lib"
+libs_r="$libs_r… | |||||
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" | |||||
+embedded_libs="$embedded_libs -L/usr/local/lib " | |||||
koobsUnsubmitted Done Inline ActionsCan't these be passed into CMAKE_* ? What is the root cause for incorrect/missing in the first place? koobs: Can't these be passed into CMAKE_* ?
What is the root cause for incorrect/missing in the first… | |||||
brnrdAuthorUnsubmitted Not Done Inline Actions$pkglibdir is dir to MariaDB's libs (default /usr/local/lib/mysql) brnrd: $pkglibdir is dir to MariaDB's libs (default /usr/local/lib/mysql)
LIBS_FOR_CLIENTS is the… | |||||
include="-I$pkgincludedir" | |||||
if [ "$basedir" != "/usr" ]; then |
Fixed