| 1 |
grknight 15/07/30 20:34:57 |
| 2 |
|
| 3 |
Modified: ChangeLog mysql-multilib.eclass |
| 4 |
Log: |
| 5 |
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra defines in the ebuild |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1739 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1738&r2=1.1739 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1738 |
| 18 |
retrieving revision 1.1739 |
| 19 |
diff -u -r1.1738 -r1.1739 |
| 20 |
--- ChangeLog 30 Jul 2015 14:04:41 -0000 1.1738 |
| 21 |
+++ ChangeLog 30 Jul 2015 20:34:57 -0000 1.1739 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30 14:04:41 grknight Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30 20:34:57 grknight Exp $ |
| 27 |
+ |
| 28 |
+ 30 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 29 |
+ Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra |
| 30 |
+ defines in the ebuild |
| 31 |
|
| 32 |
30 Jul 2015; Brian Evans <grknight@g.o> mysql-multilib.eclass: |
| 33 |
Reset variables between ABIs |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.27 eclass/mysql-multilib.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.26&r2=1.27 |
| 42 |
|
| 43 |
Index: mysql-multilib.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v |
| 46 |
retrieving revision 1.26 |
| 47 |
retrieving revision 1.27 |
| 48 |
diff -u -r1.26 -r1.27 |
| 49 |
--- mysql-multilib.eclass 30 Jul 2015 14:04:41 -0000 1.26 |
| 50 |
+++ mysql-multilib.eclass 30 Jul 2015 20:34:57 -0000 1.27 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.26 2015/07/30 14:04:41 grknight Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27 2015/07/30 20:34:57 grknight Exp $ |
| 56 |
|
| 57 |
# @ECLASS: mysql-multilib.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -45,6 +45,18 @@ |
| 60 |
# VARIABLES: |
| 61 |
# |
| 62 |
|
| 63 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES |
| 64 |
+# @DESCRIPTION: |
| 65 |
+# Add extra CMake arguments for native multilib builds |
| 66 |
+ |
| 67 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES |
| 68 |
+# @DESCRIPTION: |
| 69 |
+# Add extra CMake arguments for non-native multilib builds |
| 70 |
+ |
| 71 |
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES |
| 72 |
+# @DESCRIPTION: |
| 73 |
+# Add extra CMake arguments |
| 74 |
+ |
| 75 |
# Shorten the path because the socket path length must be shorter than 107 chars |
| 76 |
# and we will run a mysql server during test phase |
| 77 |
S="${WORKDIR}/mysql" |
| 78 |
@@ -589,7 +601,7 @@ |
| 79 |
fi |
| 80 |
|
| 81 |
# debug hack wrt #497532 |
| 82 |
- mycmakeargs+=( |
| 83 |
+ mycmakeargs=( |
| 84 |
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" |
| 85 |
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug "" "-DNDEBUG")" |
| 86 |
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr |
| 87 |
@@ -624,13 +636,6 @@ |
| 88 |
-DWITH_DEFAULT_FEATURE_SET=0 |
| 89 |
) |
| 90 |
|
| 91 |
- # systemtap only works on native ABI bug 530132 |
| 92 |
- if multilib_is_native_abi; then |
| 93 |
- mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) |
| 94 |
- else |
| 95 |
- mycmakeargs+=( -DENABLE_DTRACE=0 ) |
| 96 |
- fi |
| 97 |
- |
| 98 |
if in_iuse client-libs ; then |
| 99 |
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) ) |
| 100 |
fi |
| 101 |
@@ -687,14 +692,23 @@ |
| 102 |
fi |
| 103 |
fi |
| 104 |
|
| 105 |
+ # systemtap only works on native ABI bug 530132 |
| 106 |
+ if multilib_is_native_abi; then |
| 107 |
+ mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) ) |
| 108 |
+ [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NATIVE_DEFINES} ) |
| 109 |
+ else |
| 110 |
+ mycmakeargs+=( -DENABLE_DTRACE=0 ) |
| 111 |
+ [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_NONNATIVE_DEFINES} ) |
| 112 |
+ fi |
| 113 |
+ |
| 114 |
+ [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] && mycmakeargs+=( ${MYSQL_CMAKE_EXTRA_DEFINES} ) |
| 115 |
+ |
| 116 |
# Always build NDB with mysql-cluster for libndbclient |
| 117 |
[[ ${PN} == "mysql-cluster" ]] && mycmakeargs+=( |
| 118 |
-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1 |
| 119 |
-DWITHOUT_PARTITION_STORAGE_ENGINE=0 ) |
| 120 |
|
| 121 |
cmake-utils_src_configure |
| 122 |
- # Reset for each ABI |
| 123 |
- mycmakeargs=( ) |
| 124 |
} |
| 125 |
|
| 126 |
mysql-multilib_src_compile() { |
Archives