Author: jbeich
Date: Fri Sep 28 03:30:07 2012
New Revision: 1035
Log:
unbreak --with-system-nss on mozilla-central checkout
Modified:
trunk/Mk/bsd.gecko.mk
trunk/security/nss/files/nss-config.in
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Fri Sep 28 03:29:58 2012 (r1034)
+++ trunk/Mk/bsd.gecko.mk Fri Sep 28 03:30:07 2012 (r1035)
@@ -543,7 +543,7 @@
MOZ_OPTIONS+= --prefix="${FAKEDIR}"
CPPFLAGS+= -isystem${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LDFLAGS+= -L${LOCALBASE}/lib -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
# Standard depends
_ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
@@ -578,8 +578,6 @@
nss_MOZ_OPTIONS= --with-system-nss
nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/coreconf \
--exclude mozilla*/security/nss
-nss_CPPFLAGS+= -I${LOCALBASE}/include/nss
-I${LOCALBASE}/include/nss/nss
-nss_LDFLAGS+= -L${LOCALBASE}/lib/nss
-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
png_MOZ_OPTIONS= --with-system-png=${LOCALBASE}
@@ -606,8 +604,6 @@
RUN_DEPENDS+= ${${dep}_RUN_DEPENDS}
MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS}
EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS}
-CPPFLAGS+= ${${dep}_CPPFLAGS}
-LDFLAGS+= ${${dep}_LDFLAGS}
.endif
.endfor
Modified: trunk/security/nss/files/nss-config.in
==============================================================================
--- trunk/security/nss/files/nss-config.in Fri Sep 28 03:29:58 2012
(r1034)
+++ trunk/security/nss/files/nss-config.in Fri Sep 28 03:30:07 2012
(r1035)
@@ -123,7 +123,7 @@
fi
if test "$echo_cflags" = "yes"; then
- echo -I$includedir
+ echo -I$includedir -I$includedir/nss
fi
if test "$echo_libs" = "yes"; then
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
