Commit 53aadad6 authored by unknown's avatar unknown
Browse files

mysql_config.sh: 

  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322


scripts/mysql_config.sh:
  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
parent da1a6f58

scripts/mysql_config.sh

+19 −8
Original line number Diff line number Diff line
@@ -92,17 +92,14 @@ port='@MYSQL_TCP_PORT@' 
ldflags='@LDFLAGS@'



# Create options 



# We intentionally add a space to the beginning of lib strings, simplifies replace later

libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"

libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@"

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@"

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"



cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!

include="-I$pkgincludedir"

embedded_libs="$ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@"

embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



# Remove some options that a client doesn't have to care about

# FIXME until we have a --cxxflags, we need to remove -Xa
@@ -118,6 +115,20 @@ do 
done

cflags=`echo "$cflags"|sed -e 's/ *\$//'` 



# Same for --libs(_r)

for remove in lmtmalloc

do

  # We know the strings starts with a space

  libs=`echo "$libs"|sed -e "s/ -$remove  */ /g"` 

  libs_r=`echo "$libs_r"|sed -e "s/ -$remove  */ /g"` 

  embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove  */ /g"` 

done



# Strip trailing and ending space if any, and '+' (FIXME why?)

libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`

embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`



usage () {

        cat <<EOF

Usage: $0 [OPTIONS]