From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8F8B61381F3 for ; Thu, 27 Jun 2013 12:31:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E8BAE0991; Thu, 27 Jun 2013 12:31:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 98BC4E0991 for ; Thu, 27 Jun 2013 12:31:48 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D8A533DF2D for ; Thu, 27 Jun 2013 12:31:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A0A34E468F for ; Thu, 27 Jun 2013 12:31:44 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1372336123.78c8f664193cc391058346f3b99c3ca0dd81d9f2.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 01050_all_mariadb_mysql_config_cleanup-5.5.patch X-VCS-Directories: / X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 78c8f664193cc391058346f3b99c3ca0dd81d9f2 X-VCS-Branch: master Date: Thu, 27 Jun 2013 12:31:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c79c62ac-552f-4cfe-9ee2-41f5c2a900a4 X-Archives-Hash: b73c1651faf2c276059ea826be5a3e56 commit: 78c8f664193cc391058346f3b99c3ca0dd81d9f2 Author: Brian Evans lavabit com> AuthorDate: Thu May 2 23:46:14 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Thu Jun 27 12:28:43 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql-extras.git;a=commit;h=78c8f664 Respin mysql_config patch for mariadb 5.5 --- 00000_index.txt | 6 ++++ 01050_all_mariadb_mysql_config_cleanup-5.5.patch | 45 ++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/00000_index.txt b/00000_index.txt index ad88bff..9dcdfe0 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -240,6 +240,12 @@ @pn mariadb @@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS +@patch 01050_all_mariadb_mysql_config_cleanup-5.5.patch +@ver 5.05.00.00 to 10.01.99.99 +@pn mariadb +@pn mariadb-galera +@@ fix bug #156301 mysql_config wrongly retains too much info from CFLAGS + @patch 02000_all_query-logging-bypass-4.1.19.patch @ver 4.01.14.00 to 4.01.99.99 @pn mysql diff --git a/01050_all_mariadb_mysql_config_cleanup-5.5.patch b/01050_all_mariadb_mysql_config_cleanup-5.5.patch new file mode 100644 index 0000000..873138f --- /dev/null +++ b/01050_all_mariadb_mysql_config_cleanup-5.5.patch @@ -0,0 +1,45 @@ +--- mysql.old/scripts/mysql_config.sh 2013-05-02 20:30:14.000000000 -0400 ++++ mysql.new/scripts/mysql_config.sh 2013-05-02 20:32:36.000000000 -0400 +@@ -128,25 +128,29 @@ + cflags="$include @CFLAGS@ " #note: end space! + + # Remove some options that a client doesn't have to care about +-# FIXME until we have a --cxxflags, we need to remove -Xa +-# and -xstrconst to make --cflags usable for Sun Forte C++ +-# FIXME until we have a --cxxflags, we need to remove -AC99 +-# to make --cflags usable for HP C++ (aCC) +-for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \ +- DEXTRA_DEBUG DHAVE_valgrind O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \ +- 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \ +- Xa xstrconst "xc99=none" AC99 \ +- unroll2 ip mp restrict ++tmpcflags="" ++for f in $cflags + do +- # 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"` ++ case "${f}" in ++ -DDBUG_OFF) f="" ;; ++ -DSAFE_MUTEX) f="" ;; ++ -DUNIV_MUST_NOT_INLINE) f="" ;; ++ -DFORCE_INIT_OF_VARS) f="" ;; ++ -DEXTRA_DEBUG) f="" ;; ++ -DHAVE_valgrind) f="" ;; ++ -[ID]*) tmpcflags="${tmpcflags} ${f}" ;; ++ -[Ll]*) ++ libs="${libs} ${f}" ++ libs_r="${libs_r} ${f}" ++ embedded_libs="${embedded_libs} ${f}" ++ ;; ++ esac + done +-cflags=`echo "$cflags"|sed -e 's/ *\$//'` ++cflags="${tmpcflags# }" + + # Same for --libs(_r) +-for remove in lmtmalloc static-libcxa i-static static-intel ++for remove in lmtmalloc static-libcxa i-static static-intel lprobes_mysql + do + # We know the strings starts with a space + libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`