cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As it's done for nss/sqlite/libevent, provide a way to build against

Browse Source 
bundled nspr if MOZILLA_USE_BUNDLED_NSPR is set - no binary change for
ports using this module. Paves the way for some -stable work.
This commit is contained in:
landry 2017-02-18 16:18:48 +00:00
parent a01f2291a8
commit c47b5a3823
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
www/mozilla/mozilla.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.97 2017/01/24 21:25:14 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.98 2017/02/18 16:18:48 landry Exp $
ONLY_FOR_ARCHS ?= amd64 i386
# ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation
@ -44,8 +44,7 @@ MODMOZ_BUILD_DEPENDS = devel/autoconf/2.13 \
archivers/unzip \
archivers/zip>=2.3
MODMOZ_LIB_DEPENDS = textproc/hunspell \
devel/nspr>=4.13.1
MODMOZ_LIB_DEPENDS = textproc/hunspell
.if !defined(MOZILLA_USE_BUNDLED_NSS)
MODMOZ_LIB_DEPENDS += security/nss>=3.28.1
@ -53,6 +52,12 @@ MODMOZ_WANTLIB += nss3 nssutil3 smime3 ssl3
CONFIGURE_ARGS += --with-system-nss
.endif
.if !defined(MOZILLA_USE_BUNDLED_NSPR)
MODMOZ_LIB_DEPENDS += devel/nspr>=4.13.1
MODMOZ_WANTLIB += nspr4 plc4 plds4
CONFIGURE_ARGS += --with-system-nspr
.endif
.if !defined(MOZILLA_USE_BUNDLED_LIBEVENT)
MODMOZ_WANTLIB += event
CONFIGURE_ARGS += --with-system-libevent=/usr/
@ -77,8 +82,8 @@ MODMOZ_BUILD_DEPENDS += devel/yasm
MODMOZ_WANTLIB += X11 Xext Xrender Xt atk-1.0 c cairo \
fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
gobject-2.0 gthread-2.0 m \
nspr4 pango-1.0 pangocairo-1.0 pangoft2-1.0 \
plc4 plds4 pthread sndio stdc++ z hunspell-1.3
pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pthread sndio stdc++ z hunspell-1.3
# --no-keep-memory avoids OOM when linking libxul
# --relax avoids relocation overflow on ppc, needed since sm 2.7b, tb 10.0b, fx 15.0b
@ -103,7 +108,6 @@ USE_GMAKE ?= Yes
AUTOCONF_VERSION = 2.13
CONFIGURE_ARGS += --with-system-zlib=/usr \
--with-system-bz2=${LOCALBASE} \
--with-system-nspr \
--enable-system-hunspell \
--enable-official-branding \
--enable-gio \