From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 11 22:40:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D38A16A4DE for ; Tue, 11 Jul 2006 22:40:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7989543D49 for ; Tue, 11 Jul 2006 22:40:16 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k6BMeGLs013151 for ; Tue, 11 Jul 2006 22:40:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k6BMeG5H013150; Tue, 11 Jul 2006 22:40:16 GMT (envelope-from gnats) Resent-Date: Tue, 11 Jul 2006 22:40:16 GMT Resent-Message-Id: <200607112240.k6BMeG5H013150@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, Alexander Botero-Lowry Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48EA216A4E6 for ; Tue, 11 Jul 2006 22:35:02 +0000 (UTC) (envelope-from alex@foxybanana.com) Received: from imf21aec.mail.bellsouth.net (imf21aec.mail.bellsouth.net [205.152.59.69]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3834F43D49 for ; Tue, 11 Jul 2006 22:35:01 +0000 (GMT) (envelope-from alex@foxybanana.com) Received: from ibm63aec.bellsouth.net ([68.209.153.178]) by imf21aec.mail.bellsouth.net with ESMTP id <20060711223500.QXXP22787.imf21aec.mail.bellsouth.net@ibm63aec.bellsouth.net> for ; Tue, 11 Jul 2006 18:35:00 -0400 Received: from Laptop.mine.box ([68.209.153.178]) by ibm63aec.bellsouth.net with ESMTP id <20060711223459.KWZX1324.ibm63aec.bellsouth.net@Laptop.mine.box> for ; Tue, 11 Jul 2006 18:34:59 -0400 Received: from Laptop.mine.box (localhost [127.0.0.1]) by Laptop.mine.box (8.13.6/8.13.6) with ESMTP id k6BMY9VN027760 for ; Tue, 11 Jul 2006 17:34:18 -0500 (CDT) (envelope-from alex@localhost.my.domain) Received: (from alex@localhost) by Laptop.mine.box (8.13.6/8.13.6/Submit) id k6BMY4Du027759; Tue, 11 Jul 2006 17:34:04 -0500 (CDT) (envelope-from alex) Message-Id: <200607112234.k6BMY4Du027759@Laptop.mine.box> Date: Tue, 11 Jul 2006 17:34:04 -0500 (CDT) From: Alexander Botero-Lowry To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/100126: [MAINTAINER-UPDATE] Fix some small issues in bsd.scons.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Botero-Lowry List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Jul 2006 22:40:17 -0000 >Number: 100126 >Category: ports >Synopsis: [MAINTAINER-UPDATE] Fix some small issues in bsd.scons.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jul 11 22:40:15 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexander Botero-Lowry >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD Laptop.mine.box 6.1-STABLE FreeBSD 6.1-STABLE #1: Mon Jul 10 22:43:23 CDT 2006 root@Laptop.mine.box:/usr/src/sys/i386/compile/LAPTOP i386 >Description: - Use LIBPATH and CPPPATH by default instead of appending to LINKFLAGS/CCFLAGS, this should fix some issues with portupgrading audio/xmms2. >How-To-Repeat: install xmms2 DrDoolittle, then portupgrade to DrEvil, notice linking errors >Fix: Lovely patch to fix it! --- bsd.scons.mk.patch begins here --- --- bsd.scons.mk.orig Tue Jul 11 17:24:42 2006 +++ bsd.scons.mk Tue Jul 11 17:30:24 2006 @@ -30,13 +30,15 @@ # Some scons projects may honor PKGCONFIGDIR, which tells them where to # look for, and install, pkgconfig files. # +# LIBPATH is the search path for libraries. Bring in some safe defaults. +# +# CPPPATH is the search path for includes, Again, bring in some safe defaults. +# CCFLAGS?= ${CFLAGS} LINKFLAGS?= ${LDFLAGS} PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig - -CCFLAGS+= -I${LOCALBASE}/include -CXXFLAGS+= -I${LOCALBASE}/include -LINKFLAGS+= -L${LOCALBASE}/lib +LIBPATH= ${LOCALBASE}/lib ${X11BASE}/lib +CPPPATH= ${LOCALBASE}/include ${X11BASE}/include # # SCONS_ENV is where we pass all the stuff that should be the @@ -53,8 +55,9 @@ # argument to scons. # SCONS_ENV?= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ - PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}" + LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ + CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ + CC="${CC}" CXX="${CXX}" SCONS_ARGS?= SCONS_BUILDENV?= SCONS_TARGET?= --- bsd.scons.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: