Page MenuHomeFreeBSD
Differential D2771 Diff 7499 databases/mariadb100-server/files/patch-scripts_mysql__config.sh

Changeset View

Standalone View

View Options

databases/mariadb100-server/files/patch-scripts_mysql__config.sh

--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300 --- scripts/mysql_config.sh.orig 2015-06-17 14:54:12 UTC
+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300 +++ scripts/mysql_config.sh
@@ -108,8 +108,11 @@ @@ -109,8 +109,11 @@ fi
# We intentionally add a space to the beginning and end of lib strings, simplifies replace later # 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=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
+libs="$libs -L%%LOCALBASE%%/lib " +libs="$libs -L%%LOCALBASE%%/lib "
koobsUnsubmitted
Done
Inline Actions

Should these have changed from substitutions to hardcoded /usr/local?

If so, why?

If not, fix

koobs: Should these have changed from substitutions to hardcoded /usr/local? If so, why? If not, fix
libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+libs_r="$libs_r -L%%LOCALBASE%%/lib " +libs_r="$libs_r -L%%LOCALBASE%%/lib "
koobsUnsubmitted
Done
Inline Actions

Should these have changed from substitutions to hardcoded /usr/local?

If so, why?

If not, fix

koobs: Should these have changed from substitutions to hardcoded /usr/local? If so, why? If not, fix
embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " +embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
koobsUnsubmitted
Done
Inline Actions

Should these have changed from substitutions to hardcoded /usr/local?

If so, why?

If not, fix

koobs: Should these have changed from substitutions to hardcoded /usr/local? If so, why? If not, fix
if [ -r "$pkglibdir/libmygcc.a" ]; then if [ -r "$pkglibdir/libmygcc.a" ]; then
# When linking against the static library with a different version of GCC # When linking against the static library with a different version of GCC