2011-08-23 16:14:52 -04:00
|
|
|
$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.3 2011/08/23 20:14:52 landry Exp $
|
2011-03-30 17:39:14 -04:00
|
|
|
Ensure systemwide nss is taken
|
|
|
|
|
Ensure local libjs is taken (build failure when spidermonkey is installed,
|
|
|
|
|
its libjs_static.a is found first in lib search path)
|
|
|
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=646375
|
2011-08-23 16:14:52 -04:00
|
|
|
--- toolkit/library/libxul-config.mk.orig Fri Jul 22 00:18:55 2011
|
|
|
|
|
+++ toolkit/library/libxul-config.mk Sat Jul 30 15:37:52 2011
|
|
|
|
|
@@ -331,13 +331,14 @@ EXTRA_DSO_LDOPTS += \
|
2011-03-30 17:39:14 -04:00
|
|
|
$(JPEG_LIBS) \
|
|
|
|
|
$(PNG_LIBS) \
|
|
|
|
|
$(QCMS_LIBS) \
|
|
|
|
|
- $(MOZ_JS_LIBS) \
|
|
|
|
|
- $(NSS_LIBS) \
|
|
|
|
|
+ ../../dist/lib/libjs_static.a \
|
|
|
|
|
$(MOZ_CAIRO_LIBS) \
|
|
|
|
|
$(MOZ_HARFBUZZ_LIBS) \
|
|
|
|
|
$(MOZ_OTS_LIBS) \
|
|
|
|
|
$(MOZ_APP_EXTRA_LIBS) \
|
|
|
|
|
$(NULL)
|
|
|
|
|
+
|
|
|
|
|
+OS_LIBS += $(NSS_LIBS)
|
|
|
|
|
|
|
|
|
|
ifdef MOZ_NATIVE_ZLIB
|
|
|
|
|
EXTRA_DSO_LDOPTS += $(ZLIB_LIBS)
|
