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 D38201381F3 for ; Thu, 18 Jul 2013 12:44:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47099E09DB; Thu, 18 Jul 2013 12:44:19 +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 E298AE09DB for ; Thu, 18 Jul 2013 12:44:18 +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 03EC433E766 for ; Thu, 18 Jul 2013 12:44:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 988C1E468F for ; Thu, 18 Jul 2013 12:44:16 +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: <1374151428.d24fa6c9db443ee1d2e81989b41f85a55e90dbeb.grknight.pub@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-cmake.eclass X-VCS-Directories: eclass/ X-VCS-Committer: grknight.pub X-VCS-Committer-Name: Brian Evans X-VCS-Revision: d24fa6c9db443ee1d2e81989b41f85a55e90dbeb X-VCS-Branch: master Date: Thu, 18 Jul 2013 12:44:16 +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: bd284d37-3a7a-4503-841d-2ca825f3517c X-Archives-Hash: dff04a771639c014f255906982bf8323 commit: d24fa6c9db443ee1d2e81989b41f85a55e90dbeb Author: Brian Evans lavabit com> AuthorDate: Thu Jul 18 12:42:44 2013 +0000 Commit: Brian Evans lavabit com> CommitDate: Thu Jul 18 12:43:48 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d24fa6c9 [eclass] Fix jemalloc/tcmalloc dropping other LDFLAGS for bug 462080 --- eclass/mysql-cmake.eclass | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index 7325f21..f21e855 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -154,12 +154,12 @@ configure_cmake_standard() { mycmakeargs+=( -DWITH_SSL=bundled ) fi - if mysql_version_is_at_least "5.5" && use jemalloc; then - mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' -DWITH_SAFEMALLOC=OFF ) + if use jemalloc; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) fi - if mysql_version_is_at_least "5.5" && use tcmalloc; then - mycmakeargs+=( -DCMAKE_EXE_LINKER_FLAGS='-ltcmalloc' -DWITH_SAFEMALLOC=OFF ) + if use tcmalloc; then + mycmakeargs+=( -DWITH_SAFEMALLOC=OFF ) fi # Storage engines @@ -237,6 +237,13 @@ mysql-cmake_src_prepare() { [[ -f ${i} ]] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}" rm -f "scripts/mysqlbug" + if use jemalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" + fi + + if use tcmalloc; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" + fi epatch_user }