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

factor some common parts into mozilla.port.mk and fix DPB_PROPERTIES which

Browse Source 
is supposed to be "lonesome" on i386 because parts of the build take a lot of
ram, but actually ended up as "lonesome parallel" due to a +=. hoping this
will reduce the frequent build failures on i386.  ok landry
This commit is contained in:
sthen 2019-09-22 17:19:06 +00:00
parent 0b55ba04e7
commit a3dae6ea5d
6 changed files with 13 additions and 33 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.295 2019/09/13 15:05:17 landry Exp $
# $OpenBSD: Makefile,v 1.296 2019/09/22 17:19:07 sthen Exp $
ONLY_FOR_ARCHS = amd64 i386
COMMENT-main = Mozilla e-mail, rss and usenet client
@ -87,11 +87,6 @@ GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} #\
# lightning {e2fda1a4-762b-4020-b5ad-a41df1933103}
CONFIGURE_ARGS += --disable-debug-symbols #maybe also needed
.if ${MACHINE_ARCH} == "i386"
DPB_PROPERTIES += lonesome
.endif
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/
post-install:

7
www/firefox-esr/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.105 2019/09/19 19:15:55 landry Exp $
# $OpenBSD: Makefile,v 1.106 2019/09/22 17:19:06 sthen Exp $
COMMENT = Firefox web browser, Extended Support Release
ONLY_FOR_ARCHS = amd64 i386
@ -62,11 +62,6 @@ CONFIGURE_ARGS += --prefix=${PREFIX}
CONFIGURE_ARGS += --with-app-name=firefox-esr
CONFIGURE_ARGS += --enable-release #1386371
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg target_feature=\"sse2\""
DPB_PROPERTIES = lonesome
.endif
CONFIGURE_ARGS += --enable-sandbox --enable-content-sandbox
CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
CONFIGURE_ARGS += --with-clang-path=${LOCALBASE}/bin/clang

8
www/mozilla-firefox/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.394 2019/09/18 16:58:05 landry Exp $
# $OpenBSD: Makefile,v 1.395 2019/09/22 17:19:06 sthen Exp $
COMMENT = Mozilla web browser
ONLY_FOR_ARCHS = amd64 i386 aarch64
@ -62,12 +62,6 @@ CONFIGURE_ARGS += --prefix=${PREFIX}
MAKE_ENV += BUILD_VERBOSE_LOG="1"
CONFIGURE_ARGS += --enable-release #1386371
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg target_feature=\"sse2\""
# override parallel
DPB_PROPERTIES = lonesome
.endif
CONFIGURE_ARGS += --enable-sandbox
CONFIGURE_ARGS += --with-libclang-path=${LOCALBASE}/lib
SUBST_VARS += LOCALBASE X11BASE

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

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.126 2019/09/03 16:25:03 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.127 2019/09/22 17:19:06 sthen Exp $
# ppc: firefox-esr/thunderbird xpcshell segfaults during startup compilation
# ppc: seamonkey/firefox - failure to link for atomic ops on 64 bits
@ -8,7 +8,14 @@
# seamonkey-2.22/comm-release/mozilla/js/src/vm/Interpreter.cpp:743
# firefox-25.0/mozilla-release/js/src/builtin/MapObject.cpp:1119
.if ${MACHINE_ARCH} == "i386"
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg target_feature=\"sse2\""
# reduce build memory usage:
CONFIGURE_ARGS += --disable-debug-symbols
DPB_PROPERTIES += lonesome
.else
DPB_PROPERTIES += parallel
.endif
.for _lib in ${MOZILLA_LIBS}
SHARED_LIBS += ${_lib} ${SO_VERSION}

8
www/seamonkey/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.231 2019/09/03 16:25:31 landry Exp $
# $OpenBSD: Makefile,v 1.232 2019/09/22 17:19:07 sthen Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
@ -56,12 +56,6 @@ CONFIGURE_ARGS += --enable-calendar
# SQLITE_CFLAGS is set from pkgconfig, but it's not used for all files that need it
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
# override parallel
DPB_PROPERTIES = lonesome
.endif
post-install:
${INSTALL_MAN} ${WRKBUILD}/dist/man/man1/seamonkey.1 ${PREFIX}/man/man1/

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

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2019/07/12 20:51:06 sthen Exp $
# $OpenBSD: Makefile,v 1.36 2019/09/22 17:19:06 sthen 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).
@ -80,11 +80,6 @@ CONFIGURE_ARGS += --enable-pie
CONFIGURE_ARGS += --enable-release #1386371
# rust-simd doesn't work with lang/rust>=1.33
#CONFIGURE_ARGS += --enable-rust-simd #1261841
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS += --disable-debug-symbols
MAKE_ENV += RUSTFLAGS="-C target-cpu=pentium4 --cfg target_feature=\"sse2\""
DPB_PROPERTIES = lonesome
.endif
post-patch:
# hack config/baseconfig.mk to not use MOZ_APP_VERSION in a few places