From nobody@FreeBSD.org  Thu Jun 16 06:23:18 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52A4D1065672
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 16 Jun 2011 06:23:18 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 43D7E8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 16 Jun 2011 06:23:18 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p5G6NHaT017604
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 16 Jun 2011 06:23:17 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p5G6NHkH017596;
	Thu, 16 Jun 2011 06:23:17 GMT
	(envelope-from nobody)
Message-Id: <201106160623.p5G6NHkH017596@red.freebsd.org>
Date: Thu, 16 Jun 2011 06:23:17 GMT
From: Grzegorz Blach <magik@roorback.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Fix sysutils/tmux build when CFLAGS is set in /etc/make.conf
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         157918
>Category:       ports
>Synopsis:       Fix sysutils/tmux build when CFLAGS is set in /etc/make.conf
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 16 06:30:09 UTC 2011
>Closed-Date:    Thu Jun 16 08:43:40 UTC 2011
>Last-Modified:  Thu Jun 16 08:50:10 UTC 2011
>Originator:     Grzegorz Blach
>Release:        8.2 i386
>Organization:
>Environment:
FreeBSD komtech.roorback.net 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #0 r222496: Mon May 30 15:25:42 CEST 2011     magik@komtech.roorback.net:/usr/obj/usr/src/sys/KOMTECH  i386

>Description:
Attached patch introduce new Makefile variable EXTRA-CPPFLAGS which don't override CFLAGS and CPPFLAGS variables from /etc/make.conf

>How-To-Repeat:
- In /etc/make.conf set CFLAGS=-O2 or any usefull value.
- cd /usr/ports/sysutils/tmux
- make

>Fix:
Apply attached patch

Patch attached with submission follows:

--- Makefile.orig   2011-05-26 09:57:23.000000000 +0000
+++ Makefile    2011-05-26 09:56:55.000000000 +0000
@@ -35,14 +35,14 @@
 .include <bsd.port.pre.mk>

 .if defined(WITH_LIBEVENT2)
-CFLAGS+=   -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
+EXTRA_CPPFLAGS+=   -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
 LDFLAGS+=  -L${LOCALBASE}/lib/event2
 .else
-CFLAGS+=   -I${LOCALBASE}/include
+EXTRA_CPPFLAGS+=   -I${LOCALBASE}/include
 LDFLAGS+=  -L${LOCALBASE}/lib
 .endif

-MAKE_ENV+= LDFLAGS="${LDFLAGS}"
+MAKE_ENV+= EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}" LDFLAGS="${LDFLAGS}"

 .if defined(WITH_LIBEVENT_STATIC)
 . if defined(WITH_LIBEVENT2)
@@ -81,6 +81,7 @@
        ${WRKSRC}/tmux.1 ${WRKSRC}/tmux.h
    @${REINPLACE_CMD} -e 's|-I/usr/local/include||g' \
        -e 's|/usr/local|${LOCALBASE}|g' \
+       -e 's|$${CPPFLAGS}$$|${CPPFLAGS} ${EXTRA_CPPFLAGS}|g' \
        -e 's|LDFLAGS+=|#LDFLAGS+=|g' \
        ${WRKSRC}/Makefile
    @${REINPLACE_CMD} -e 's|-levent|${_LEVENT_LIB}|g' \


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jun 16 06:30:21 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157918 
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Thu Jun 16 08:43:39 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157918: commit references a PR
Date: Thu, 16 Jun 2011 08:42:46 +0000 (UTC)

 wen         2011-06-16 08:42:28 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/tmux        Makefile 
   Log:
   - Fix build when CFLAGS is set in /etc/make.conf
   
   PR:             ports/157918
   Submitted by:   Grzegorz Blach <magik@roorback.net>
   
   Revision  Changes    Path
   1.28      +5 -4      ports/sysutils/tmux/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"
 
>Unformatted:
