On Fri, 28 Sep 2012, [email protected] wrote:
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]"
FreeBSD FBSD10 10.0-CURRENT FreeBSD 10.0-CURRENT #21 r241019: Thu Sep 27
23:09:26 EDT 2012 root@FBSD10:/usr/obj/usr/src/sys/MYKERNEL amd64
<...>
clang++ -o nsNSSCleaner.o -c -I../../../../dist/stl_wrappers
-I../../../../dist/system_wrappers -include
../../../../../config/gcc_hidden.h -DNSS_ENABLE_ECC -DDLL_PREFIX=\"lib\"
-DDLL_SUFFIX=\".so\" -DMOZ_GLUE_IN_PROGRAM
-DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM
-DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET
-DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API
-I/usr/local/include/nss -I../../../../../security/manager/ssl/src -I.
-I../../../../dist/include -I/usr/local/include/nspr
-I/usr/local/include/nss -I/usr/local/include -I/usr/local/include
-fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include
-Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual
-Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy
-Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros
-Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option
-Wno-return-type-c-linkage -Wno-mismatched-tags -O2 -pipe
-fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti
-ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pipe
-DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -Qunused-arguments
-isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include
../../../../mozilla-config.h -MD -MF .deps/nsNSSCleaner.o.pp
/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsNSSCleaner.cpp
nsCertOverrideService.cpp
clang++ -o nsCertOverrideService.o -c -I../../../../dist/stl_wrappers
-I../../../../dist/system_wrappers -include
../../../../../config/gcc_hidden.h -DNSS_ENABLE_ECC -DDLL_PREFIX=\"lib\"
-DDLL_SUFFIX=\".so\" -DMOZ_GLUE_IN_PROGRAM
-DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1 -DMOZILLA_INTERNAL_API -D_IMPL_NS_COM
-DEXPORT_XPT_API -DEXPORT_XPTC_API -D_IMPL_NS_GFX -D_IMPL_NS_WIDGET
-DIMPL_XREAPI -DIMPL_NS_NET -DIMPL_THEBES -DSTATIC_EXPORTABLE_JS_API
-I/usr/local/include/nss -I../../../../../security/manager/ssl/src -I.
-I../../../../dist/include -I/usr/local/include/nspr
-I/usr/local/include/nss -I/usr/local/include -I/usr/local/include
-fPIC -Qunused-arguments -isystem/usr/local/include -I/usr/local/include
-Qunused-arguments -Wall -Wpointer-arith -Woverloaded-virtual
-Werror=return-type -Wtype-limits -Wempty-body -Wno-ctor-dtor-privacy
-Wno-overlength-strings -Wno-invalid-offsetof -Wno-variadic-macros
-Wno-c++0x-extensions -Wno-extended-offsetof -Wno-unknown-warning-option
-Wno-return-type-c-linkage -Wno-mismatched-tags -O2 -pipe
-fno-strict-aliasing -fno-exceptions -fno-strict-aliasing -fno-rtti
-ffunction-sections -fdata-sections -fno-exceptions -std=gnu++0x -pipe
-DNDEBUG -DTRIMMED -O2 -fomit-frame-pointer -Qunused-arguments
-isystem/usr/local/include -I/usr/local/include -DMOZILLA_CLIENT -include
../../../../mozilla-config.h -MD -MF .deps/nsCertOverrideService.o.pp
/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCertOverrideService.cpp
nsRecentBadCerts.cpp
In file included from
/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsNSSCleaner.cpp:5:
In file included from
../../../../../security/manager/ssl/src/nsNSSCleaner.h:94:
../../../../dist/system_wrappers/certt.h:2:15: fatal error: 'certt.h' file
not found
#include_next <certt.h>
^
1 error generated.
gmake[5]: *** [nsNSSCleaner.o] Error 1
gmake[5]: *** Waiting for unfinished jobs....
In file included from
/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCERTValInParamWrapper.cpp:5:
In file included from
../../../../../security/manager/ssl/src/nsCERTValInParamWrapper.h:9:
../../../../dist/system_wrappers/cert.h:2:15: fatal error: 'cert.h' file
not found
#include_next <cert.h>
^
1 error generated.
gmake[5]: *** [nsCERTValInParamWrapper.o] Error 1
In file included from
/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/security/manager/ssl/src/nsCertOverrideService.cpp:7:
In file included from
../../../../../security/manager/ssl/src/nsCertOverrideService.h:16:
../../../../dist/system_wrappers/secoidt.h:2:15: fatal error: 'secoidt.h'
file not found
#include_next <secoidt.h>
^
1 error generated.
gmake[5]: *** [nsCertOverrideService.o] Error 1
gmake[5]: Leaving directory
`/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager/ssl/src'
gmake[4]: *** [libs] Error 2
gmake[4]: Leaving directory
`/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager/ssl'
gmake[3]: *** [libs] Error 2
gmake[3]: Leaving directory
`/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0/security/manager'
gmake[2]: *** [libs_tier_platform] Error 2
gmake[2]: Leaving directory
`/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0'
gmake[1]: *** [tier_platform] Error 2
gmake[1]: Leaving directory
`/home/root/ff_nightly/work/mozilla-central-cdd4506bc66c/obj-x86_64-portbld-freebsd10.0'
gmake: *** [default] Error 2
*** [do-build] Error code 1
Stop in /home/root/ff_nightly.
*** [/home/root/ff_nightly/work/.build_done.firefox._usr_local] Error code
1
Stop in /home/root/ff_nightly.
*** [build] Error code 1
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
