Date: Tue, 11 Jul 2006 17:34:04 -0500 (CDT) From: Alexander Botero-Lowry <alex@foxybanana.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/100126: [MAINTAINER-UPDATE] Fix some small issues in bsd.scons.mk Message-ID: <200607112234.k6BMY4Du027759@Laptop.mine.box> Resent-Message-ID: <200607112240.k6BMeG5H013150@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607112234.k6BMY4Du027759>