From amdmi3@amdmi3.ru  Wed Aug 13 15:42:37 2008
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B90201065678
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 15:42:37 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [217.170.79.85])
	by mx1.freebsd.org (Postfix) with ESMTP id 8169A8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 15:42:37 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLSv1:AES256-SHA:256)
	(Exim 4.69)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1KTIUg-0000p9-VO
	for FreeBSD-gnats-submit@freebsd.org; Wed, 13 Aug 2008 19:42:39 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 2784C8FA4
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 13 Aug 2008 19:42:36 +0400 (MSD)
Received: by hades.panopticon (Postfix, from userid 1000)
	id B85A51702D; Wed, 13 Aug 2008 19:42:34 +0400 (MSD)
Message-Id: <20080813154234.B85A51702D@hades.panopticon>
Date: Wed, 13 Aug 2008 19:42:34 +0400 (MSD)
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Reply-To: Dmitry Marakasov <amdmi3@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] bsd.cmake.mk: set CMAKE_BUILD_TYPE to ""
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         126507
>Category:       ports
>Synopsis:       [PATCH] bsd.cmake.mk: set CMAKE_BUILD_TYPE to ""
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 13 15:50:01 UTC 2008
>Closed-Date:    Fri Jan 30 19:34:00 UTC 2009
>Last-Modified:  Fri Jan 30 19:34:00 UTC 2009
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 7.0-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #1: Wed Jun 25 15:36:22 MSD 2008 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386


>Description:
CMake has several build types, and (I think that appeared in 2.6.1) adds stuff to {C,CXX}FLAGS depending on buildtype.

From /usr/local/share/cmake/Modules/Platform/gcc.cmake:
  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")

Currently, buildtype is set to Release, so `-O3 -DNDEBUG' is unconditionally added to cflags, which is, of course, very bad.

Thus, hardcode CMAKE_BUILD_TYPE to "", so cmake doesn't ever tamper with cflags set by the ports system.
>How-To-Repeat:
>Fix:

--- bsd.cmake.mk.patch begins here ---
Index: bsd.cmake.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.cmake.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.cmake.mk
--- bsd.cmake.mk	10 Aug 2008 15:43:46 -0000	1.2
+++ bsd.cmake.mk	13 Aug 2008 15:35:02 -0000
@@ -47,12 +47,11 @@
 				-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
 				-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
 				-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
-				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}"
+				-DCMAKE_BUILD_TYPE:STRING=""
 
 #
 # Default build type and sourcedir
 #
-CMAKE_BUILD_TYPE?=	Release
 CMAKE_SOURCE_PATH?=	.
 CMAKE_INSTALL_PREFIX?=	${PREFIX}
 
--- bsd.cmake.mk.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126507: [PATCH] bsd.cmake.mk: set CMAKE_BUILD_TYPE to ""
Date: Wed, 13 Aug 2008 19:58:52 +0400

 > >Synopsis:       [PATCH] bsd.cmake.mk: set CMAKE_BUILD_TYPE to ""
 
 Improved patch: also remove no longer needed comment.
 
 --- bsd.cmake.mk.patch begins here ---
 Index: bsd.cmake.mk
 ===================================================================
 RCS file: /home/pcvs/ports/Mk/bsd.cmake.mk,v
 retrieving revision 1.2
 diff -u -r1.2 bsd.cmake.mk
 --- bsd.cmake.mk	10 Aug 2008 15:43:46 -0000	1.2
 +++ bsd.cmake.mk	13 Aug 2008 15:56:54 -0000
 @@ -10,8 +10,6 @@
  # CMAKE_USE_PTHREAD	- Instruct cmake to use pthreads when 
  #					compiling/linking
  #					Default: not set
 -# CMAKE_BUILD_TYPE	- Type of build (release, debug)
 -#					Default: Release
  # CMAKE_VERBOSE		- Verbose build
  #					Default: not set
  # CMAKE_SOURCE_PATH	- Path to sourcedir for cmake
 @@ -47,12 +45,11 @@
  				-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
  				-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
  				-DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \
 -				-DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}"
 +				-DCMAKE_BUILD_TYPE:STRING=""
  
  #
  # Default build type and sourcedir
  #
 -CMAKE_BUILD_TYPE?=	Release
  CMAKE_SOURCE_PATH?=	.
  CMAKE_INSTALL_PREFIX?=	${PREFIX}
  
 --- bsd.cmake.mk.patch ends here ---
 
 -- 
 Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
 amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 14 00:42:34 UTC 2008 
Responsible-Changed-Why:  
bsd.cmake.mk is kde territory (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126507 
State-Changed-From-To: open->patched 
State-Changed-By: miwi 
State-Changed-When: Wed Jan 28 23:23:29 UTC 2009 
State-Changed-Why:  
patched in area51. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126507 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126507: commit references a PR
Date: Fri, 30 Jan 2009 19:25:35 +0000 (UTC)

 miwi        2009-01-30 19:25:22 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.cmake.mk 
     devel/cmake          Makefile distinfo pkg-plist 
     x11/qimageblitz      Makefile 
   Log:
   - Update to 2.6.2
   - Remove CMAKE_BUILD_TYPE [1]
   
   CMAKE_BUILD_TYPE only affects compiler FLAGS and linking with specific
   library versions  (debug |optimized | general).
   
   In our case external libraries reside in other ports and only install
   one version (no separate debug/optimized). Also, the ports system
   provide correct compiler flags (-g and no optimizations when WITH_DEBUG
   is used). Thus, cmake buildtypes only add extra compiler flags. Ports will
   be built correctly both by default and for WITH_DEBUG case.
   
   - Also, change WRKSRC to CONFIGURE_WRKSRC. (use CONFIGURE_WRKSRC for configure
     target instead of WRKSRC)
   
   PR:             126507 [1]
   Submitted by:   amdmi3@ [1]
   Tested with:    exp-run
   Thanks to:      pav/amdmi3
   
   Revision  Changes    Path
   1.3       +7 -10     ports/Mk/bsd.cmake.mk
   1.28      +1 -2      ports/devel/cmake/Makefile
   1.21      +3 -3      ports/devel/cmake/distinfo
   1.18      +2 -0      ports/devel/cmake/pkg-plist
   1.3       +0 -1      ports/x11/qimageblitz/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: miwi 
State-Changed-When: Fri Jan 30 19:34:00 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126507 
>Unformatted:
