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

Consolidate textproc/icu4c common dependency into mozilla.port.mk, and

Browse Source 
allow to build against bundled icu4c by setting MOZILLA_USE_BUNDLED_ICU.
This commit is contained in:
landry 2017-02-18 16:22:54 +00:00
parent c47b5a3823
commit 14b5d6af78
6 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/mozilla-thunderbird/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.236 2017/02/08 13:26:47 landry Exp $
# $OpenBSD: Makefile,v 1.237 2017/02/18 16:22:54 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -66,11 +66,6 @@ CONFIGURE_ARGS += --disable-gstreamer
CONFIGURE_ARGS += --disable-debug-symbols
.endif
# bug #1064665
LIB_DEPENDS += textproc/icu4c
CONFIGURE_ARGS += --with-system-icu
WANTLIB += icudata icui18n icuuc
# bug 857628
CONFIGURE_ARGS += --enable-pie

7
www/firefox-esr/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.46 2017/01/24 21:35:09 landry Exp $
# $OpenBSD: Makefile,v 1.47 2017/02/18 16:22:54 landry Exp $
COMMENT = Firefox web browser, Extended Support Release
@ -52,11 +52,6 @@ CONFIGURE_ARGS += --disable-webrtc
# SQLITE_CFLAGS is set from pkgconfig, but it's not used for all files that need it
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
# bug #1064665
LIB_DEPENDS += textproc/icu4c
CONFIGURE_ARGS += --with-system-icu
WANTLIB += icudata icui18n icuuc
CONFIGURE_ARGS += --disable-gstreamer
# bug 857628

7
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.308 2017/01/24 21:33:09 landry Exp $
# $OpenBSD: Makefile,v 1.309 2017/02/18 16:22:54 landry Exp $
COMMENT = Mozilla web browser
@ -51,11 +51,6 @@ CONFIGURE_ARGS += --disable-debug-symbols
# relies on pulseaudio for sound and broken at runtime
#CONFIGURE_ARGS += --disable-webrtc
# bug #1064665
LIB_DEPENDS += textproc/icu4c
CONFIGURE_ARGS += --with-system-icu
WANTLIB += icudata icui18n icuuc
# bug 857628
CONFIGURE_ARGS += --enable-pie

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

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.98 2017/02/18 16:18:48 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.99 2017/02/18 16:22:54 landry Exp $
ONLY_FOR_ARCHS ?= amd64 i386
# ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation
@ -63,6 +63,12 @@ MODMOZ_WANTLIB += event
CONFIGURE_ARGS += --with-system-libevent=/usr/
.endif
.if !defined(MOZILLA_USE_BUNDLED_ICU)
MODMOZ_LIB_DEPENDS += textproc/icu4c
MODMOZ_WANTLIB += icudata icui18n icuuc
CONFIGURE_ARGS += --with-system-icu
.endif
.if !defined(MOZILLA_USE_BUNDLED_SQLITE)
MODMOZ_WANTLIB += sqlite3>=32
MODMOZ_LIB_DEPENDS += databases/sqlite3

7
www/seamonkey/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.195 2017/01/24 21:27:28 landry Exp $
# $OpenBSD: Makefile,v 1.196 2017/02/18 16:22:54 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -64,11 +64,6 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ARGS += --disable-debug-symbols
.endif
# bug #1064665
LIB_DEPENDS += textproc/icu4c
CONFIGURE_ARGS += --with-system-icu
WANTLIB += icudata icui18n icuuc
GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
# guid for gdata-provider comes from em:id in install.rdf
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc}

7
www/tor-browser/browser/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2017/01/31 13:48:18 landry Exp $
# $OpenBSD: Makefile,v 1.6 2017/02/18 16:22:54 landry Exp $
# Some of this comes from www/firefox-esr as apropos, since Tor
# browser is a fork of ESR. It is a good idea to look at that
# Makefile when editing this one (ESR versions not always the same).
@ -73,11 +73,6 @@ CONFIGURE_ARGS += --with-app-name=${BROWSER_NAME} \
# relies on pulseaudio for sound and broken at runtime
CONFIGURE_ARGS += --disable-webrtc
# bug #1064665
LIB_DEPENDS += textproc/icu4c
CONFIGURE_ARGS += --with-system-icu
WANTLIB += icudata icui18n icuuc
CONFIGURE_ARGS += --disable-gstreamer
RUN_DEPENDS += net/tor>=0.2.9.9p0