| 1 |
vapier 08/10/27 05:06:41 |
| 2 |
|
| 3 |
Modified: cmake-utils.eclass toolchain.eclass |
| 4 |
Log: |
| 5 |
set threading type to win32 for ming targets #242344 by cJ |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.11 eclass/cmake-utils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.11&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?rev=1.11&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/cmake-utils.eclass?r1=1.10&r2=1.11 |
| 13 |
|
| 14 |
Index: cmake-utils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v |
| 17 |
retrieving revision 1.10 |
| 18 |
retrieving revision 1.11 |
| 19 |
diff -u -r1.10 -r1.11 |
| 20 |
--- cmake-utils.eclass 28 Sep 2008 18:52:16 -0000 1.10 |
| 21 |
+++ cmake-utils.eclass 27 Oct 2008 05:06:41 -0000 1.11 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.10 2008/09/28 18:52:16 jmbsvicetto Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.11 2008/10/27 05:06:41 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: cmake-utils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -85,6 +85,10 @@ |
| 31 |
cmake-utils_src_configure() { |
| 32 |
debug-print-function $FUNCNAME $* |
| 33 |
|
| 34 |
+ if has debug ${IUSE//+} && use debug ; then |
| 35 |
+ append-cppflags -DNDEBUG |
| 36 |
+ fi |
| 37 |
+ |
| 38 |
if [[ -n "${CMAKE_IN_SOURCE_BUILD}" ]]; then |
| 39 |
cmake-utils_src_configurein |
| 40 |
else |
| 41 |
@@ -141,11 +145,8 @@ |
| 42 |
# Internal use only. Common configuration options for all types of builds. |
| 43 |
_common_configure_code() { |
| 44 |
local tmp_libdir=$(get_libdir) |
| 45 |
- if has debug ${IUSE//+} && use debug; then |
| 46 |
- echo -DCMAKE_BUILD_TYPE=Debug |
| 47 |
- else |
| 48 |
- echo -DCMAKE_BUILD_TYPE=Release |
| 49 |
- fi |
| 50 |
+ # CMAKE_BUILD_TYPE only modifies compiler flags, so set to None |
| 51 |
+ echo -DCMAKE_BUILD_TYPE=None |
| 52 |
echo -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) |
| 53 |
echo -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) |
| 54 |
echo -DCMAKE_INSTALL_PREFIX=${PREFIX:-/usr} |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.365 eclass/toolchain.eclass |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.365&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.365&content-type=text/plain |
| 62 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.364&r2=1.365 |
| 63 |
|
| 64 |
Index: toolchain.eclass |
| 65 |
=================================================================== |
| 66 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
| 67 |
retrieving revision 1.364 |
| 68 |
retrieving revision 1.365 |
| 69 |
diff -u -r1.364 -r1.365 |
| 70 |
--- toolchain.eclass 24 Oct 2008 07:30:35 -0000 1.364 |
| 71 |
+++ toolchain.eclass 27 Oct 2008 05:06:41 -0000 1.365 |
| 72 |
@@ -1,6 +1,6 @@ |
| 73 |
# Copyright 1999-2008 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.364 2008/10/24 07:30:35 kumba Exp $ |
| 76 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.365 2008/10/27 05:06:41 vapier Exp $ |
| 77 |
# |
| 78 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
| 79 |
|
| 80 |
@@ -1326,7 +1326,9 @@ |
| 81 |
if [[ ${GCCMAJOR}.${GCCMINOR} > 4.1 ]] ; then |
| 82 |
confgcc="${confgcc} --disable-bootstrap --disable-libgomp" |
| 83 |
fi |
| 84 |
- elif [[ ${CHOST} != mingw* ]] && [[ ${CHOST} != *-mingw* ]] ; then |
| 85 |
+ elif [[ ${CHOST} == mingw* ]] || [[ ${CHOST} == *-mingw* ]] ; then |
| 86 |
+ confgcc="${confgcc} --enable-shared --enable-threads=win32" |
| 87 |
+ else |
| 88 |
confgcc="${confgcc} --enable-shared --enable-threads=posix" |
| 89 |
fi |
| 90 |
[[ ${CTARGET} == *-elf ]] && confgcc="${confgcc} --with-newlib" |
Archives