X-Git-Url: https://git.tld-linux.org/?p=packages%2Fmysql.git;a=blobdiff_plain;f=mysql-config.patch;h=ac61f8fd8c9148f62440598d397c408a97f5db8f;hp=a87be1b79117e6966729a2dda03acc30bedee351;hb=5d87e23e83778b780ea870de884296569fd5b127;hpb=45b2428a6aedc04e4e744b411c27d7cb1f8c0805 diff --git a/mysql-config.patch b/mysql-config.patch index a87be1b..ac61f8f 100644 --- a/mysql-config.patch +++ b/mysql-config.patch @@ -1,5 +1,5 @@ ---- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh.orig 2013-10-07 10:25:25.000000000 +0000 -+++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh 2013-10-13 13:25:11.342999630 +0000 +--- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh~ 2013-10-07 12:25:25.000000000 +0200 ++++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh 2013-10-15 18:17:41.547988430 +0200 @@ -124,23 +124,23 @@ for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \ DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ @@ -10,9 +10,8 @@ # The first option we might strip will always have a space before it because # we set -I$pkgincludedir as the first option - cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"` -- cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` -+ cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` -+ cxxflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` ++ cflags=`echo "$cflags"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` + cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove */ /g"` done cflags=`echo "$cflags"|sed -e 's/ *\$//'` cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` @@ -25,9 +24,9 @@ - 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"` -+ libs=`echo "$libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` -+ libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` -+ embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` ++ libs=`echo "$libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` ++ libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` ++ embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove *\)\{1,\}/ /g"` done # Strip trailing and ending space if any, and '+' (FIXME why?)