From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 16 06:30:10 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F5EE106564A for ; Thu, 16 Jun 2011 06:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F0C8C8FC12 for ; Thu, 16 Jun 2011 06:30:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5G6U9A1001216 for ; Thu, 16 Jun 2011 06:30:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5G6U928001215; Thu, 16 Jun 2011 06:30:09 GMT (envelope-from gnats) Resent-Date: Thu, 16 Jun 2011 06:30:09 GMT Resent-Message-Id: <201106160630.p5G6U928001215@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Grzegorz Blach Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52A4D1065672 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/157918: Fix sysutils/tmux build when CFLAGS is set in /etc/make.conf X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2011 06:30:10 -0000 >Number: 157918 >Category: ports >Synopsis: Fix sysutils/tmux build when CFLAGS is set in /etc/make.conf >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Jun 16 06:30:09 UTC 2011 >Closed-Date: >Last-Modified: >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 .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: >Unformatted: