diff options
| author | alepulver <alepulver@FreeBSD.org> | 2006-07-13 22:10:39 +0000 |
|---|---|---|
| committer | alepulver <alepulver@FreeBSD.org> | 2006-07-13 22:10:39 +0000 |
| commit | 2efdd1798b3ea8bb3c8617e38aa8f2c35c71e18f (patch) | |
| tree | ebceb1a161be48710abb216f5a9c28463dd92fb1 /Mk/bsd.scons.mk | |
| parent | 75eee1ba46c569bbd2691636157df1ff882a88d9 (diff) | |
| download | FreeBSD-ports-2efdd1798b3ea8bb3c8617e38aa8f2c35c71e18f.zip FreeBSD-ports-2efdd1798b3ea8bb3c8617e38aa8f2c35c71e18f.tar.gz | |
- Use LIBPATH and CPPPATH by default instead of appending to LINKFLAGS/CCFLAGS,
this should fix some issues with portupgrading audio/xmms2.
PR: 100126
Submitted by: maintainer
Diffstat (limited to 'Mk/bsd.scons.mk')
| -rw-r--r-- | Mk/bsd.scons.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Mk/bsd.scons.mk b/Mk/bsd.scons.mk index 950b9a0..37222a7 100644 --- a/Mk/bsd.scons.mk +++ b/Mk/bsd.scons.mk @@ -30,13 +30,15 @@ SCONS_PORT= ${PORTSDIR}/devel/scons # 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 @@ LINKFLAGS+= -L${LOCALBASE}/lib # 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?= |
