cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- when cmake uses gcc to build things, make it correctly grab CFLAGS and

Browse Source 
CXXFLAGS variables and don't force compiler optimizations

ok espie@
This commit is contained in:
ajacoutot 2007-06-18 11:52:26 +00:00
parent 27fa2f7049
commit b53948be18
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cmake/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2007/06/16 13:01:37 espie Exp $
# $OpenBSD: Makefile,v 1.12 2007/06/18 11:52:26 ajacoutot Exp $
HOMEPAGE= http://www.cmake.org/
CATEGORIES= devel
COMMENT= portable build system
DISTNAME= cmake-2.4.6
PKGNAME= ${DISTNAME}p6
PKGNAME= ${DISTNAME}p7
MASTER_SITES= ${HOMEPAGE}files/v2.4/
MAINTAINER= Marc Espie <espie@openbsd.org>

25
devel/cmake/patches/patch-Modules_Platform_gcc_cmake Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-Modules_Platform_gcc_cmake,v 1.1 2007/06/18 11:52:26 ajacoutot Exp $
--- Modules/Platform/gcc.cmake.orig Mon Jun 18 13:25:47 2007
+++ Modules/Platform/gcc.cmake Mon Jun 18 13:27:30 2007
@@ -2,8 +2,8 @@ IF(CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_C_FLAGS_INIT "")
SET (CMAKE_C_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
- SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+ SET (CMAKE_C_FLAGS_RELEASE_INIT "$ENV{CFLAGS} -DNDEBUG")
+ SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "$ENV{CFLAGS} -g")
SET (CMAKE_C_CREATE_PREPROCESSED_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
SET (CMAKE_C_CREATE_ASSEMBLY_SOURCE "<CMAKE_C_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
SET (CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
@@ -13,8 +13,8 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
SET (CMAKE_CXX_FLAGS_INIT "")
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g")
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "-Os -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3 -DNDEBUG")
- SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2 -g")
+ SET (CMAKE_CXX_FLAGS_RELEASE_INIT "$ENV{CXXFLAGS} -DNDEBUG")
+ SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "$ENV{CXXFLAGS} -g")
SET (CMAKE_CXX_CREATE_PREPROCESSED_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -E <SOURCE> > <PREPROCESSED_SOURCE>")
SET (CMAKE_CXX_CREATE_ASSEMBLY_SOURCE "<CMAKE_CXX_COMPILER> <FLAGS> -S <SOURCE> -o <ASSEMBLY_SOURCE>")
SET (CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")