openbsd-ports/www/mozilla-firefox/patches/patch-toolkit_library_libxul-config_mk
landry 433f3c4b5e Update to mozilla-firefox 5.0:
That's the first release following the new fast scheme of one major
release every 6 weeks..
Check out http://www.mozilla.com/en-US/firefox/5.0/releasenotes/ for
release notes. Note that it's still badly broken on sparc64, and
unlikely to be fixed soon... you still have www/firefox36.

Tested by (at least, probably forgetting some..) rpointel@, pea@,
ckuethe@ and myself on amd64, bluhm@ on i386 and ajacoutot@ on macppc
(thanks!)
ok rpointel@
2011-06-28 05:43:57 +00:00

25 lines
780 B
Plaintext

$OpenBSD: patch-toolkit_library_libxul-config_mk,v 1.2 2011/06/28 05:43:57 landry Exp $
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
--- toolkit/library/libxul-config.mk.orig Fri May 27 18:12:47 2011
+++ toolkit/library/libxul-config.mk Tue May 31 22:18:40 2011
@@ -340,13 +340,14 @@ EXTRA_DSO_LDOPTS += \
$(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)