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

www/mozilla/mozilla.port.mk: assorted cleanup for gecko 106

Browse Source 
- bump nss/nspr dependencies
- tidy up WANTLIB, factorize some from consumer ports
- move devel/m4 BDEP to the module
- factorize CONFIGURE_ENV for M4 detection
This commit is contained in:
landry 2022-10-18 14:30:02 +00:00
parent 107028ab67
commit 1f57d68303
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,13 +68,13 @@ MODMOZ_BUILD_DEPENDS = devel/autoconf/2.13 \
archivers/zip>=2.3 archivers/zip>=2.3
.if !defined(MOZILLA_USE_BUNDLED_NSS) .if !defined(MOZILLA_USE_BUNDLED_NSS)
MODMOZ_LIB_DEPENDS += security/nss>=3.80 MODMOZ_LIB_DEPENDS += security/nss>=3.84
MODMOZ_WANTLIB += nss3 nssutil3 smime3 ssl3 MODMOZ_WANTLIB += nss3 nssutil3 smime3 ssl3
CONFIGURE_ARGS += --with-system-nss CONFIGURE_ARGS += --with-system-nss
.endif .endif
.if !defined(MOZILLA_USE_BUNDLED_NSPR) .if !defined(MOZILLA_USE_BUNDLED_NSPR)
MODMOZ_LIB_DEPENDS += devel/nspr>=4.34 MODMOZ_LIB_DEPENDS += devel/nspr>=4.35
MODMOZ_WANTLIB += nspr4 plc4 plds4 MODMOZ_WANTLIB += nspr4 plc4 plds4
CONFIGURE_ARGS += --with-system-nspr CONFIGURE_ARGS += --with-system-nspr
.endif .endif
@ -99,12 +99,14 @@ MODMOZ_BUILD_DEPENDS += devel/nasm
MODMOZ_BUILD_DEPENDS += lang/rust MODMOZ_BUILD_DEPENDS += lang/rust
# stylo build needs LLVM # stylo build needs LLVM
MODMOZ_BUILD_DEPENDS += devel/llvm MODMOZ_BUILD_DEPENDS += devel/llvm
#1670807
MODMOZ_BUILD_DEPENDS += devel/m4
MODMOZ_WANTLIB += X11 Xcomposite Xdamage Xext Xfixes Xrender atk-1.0 c cairo \ MODMOZ_WANTLIB += X11 X11-xcb Xcomposite Xcursor Xdamage Xext Xfixes Xi Xrender \
fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0 \ atk-1.0 c cairo fontconfig freetype gdk_pixbuf-2.0 \
gobject-2.0 m \ gio-2.0 glib-2.0 gobject-2.0 harfbuzz intl m \
pango-1.0 pangocairo-1.0 \ pango-1.0 pangocairo-1.0 sndio z xcb xcb-shm
pthread sndio ${LIBCXX} z MODMOZ_WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += ${MODMOZ_WANTLIB} WANTLIB += ${MODMOZ_WANTLIB}
BUILD_DEPENDS +=${MODMOZ_BUILD_DEPENDS} BUILD_DEPENDS +=${MODMOZ_BUILD_DEPENDS}
@ -156,3 +158,4 @@ CONFIGURE_ENV += ac_cv_path_SED=/usr/bin/sed
CONFIGURE_ENV += ac_cv_path_mkdir=/bin/mkdir CONFIGURE_ENV += ac_cv_path_mkdir=/bin/mkdir
CONFIGURE_ENV += ac_cv_prog_AWK=/usr/bin/awk CONFIGURE_ENV += ac_cv_prog_AWK=/usr/bin/awk
CONFIGURE_ENV += AWK=/usr/bin/awk CONFIGURE_ENV += AWK=/usr/bin/awk
CONFIGURE_ENV += M4=/usr/local/bin/gm4