mirror of
https://github.com/LibreELEC/LibreELEC.tv
synced 2025-09-24 19:46:01 +07:00
eeade2aaeb
including "$ldflags" with --libs is not an intended behaviour. this fixes the case where one must rebuild mysql with DEBUG in order to have xbmc DEBUG build.
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 161d55d84441bd3b66eba9eafd85782eeb168cdd Mon Sep 17 00:00:00 2001
|
|
From: Stefan Saraev <stefan@saraev.ca>
|
|
Date: Fri, 28 Mar 2014 13:12:50 +0200
|
|
Subject: [PATCH] mysql_config: dont include LDFLAGS in --libs output
|
|
|
|
---
|
|
scripts/mysql_config.sh | 6 +++---
|
|
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
|
|
index 7dc9beb..eb188b6 100644
|
|
--- a/scripts/mysql_config.sh
|
|
+++ b/scripts/mysql_config.sh
|
|
@@ -105,10 +105,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 @LIBDL@ @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 @LIBDL@ @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
|
|
--
|
|
1.7.2.5
|
|
|