Tue Oct 23 12:33:04 2018 UTC ()
mozilla: Don't --enable-pie on SunOS.


(jperkin)
diff -r1.29 -r1.30 pkgsrc/security/tor-browser/Makefile
diff -r1.8 -r1.9 pkgsrc/www/firefox45/mozilla-common.mk
diff -r1.2 -r1.3 pkgsrc/www/firefox52/mozilla-common.mk
diff -r1.1 -r1.2 pkgsrc/www/firefox60/mozilla-common.mk
cvs diff -r1.29 -r1.30 pkgsrc/security/tor-browser/Makefile (expand / switch to unified diff)

--- pkgsrc/security/tor-browser/Makefile 2018/08/22 09:46:30 1.29
+++ pkgsrc/security/tor-browser/Makefile 2018/10/23 12:33:04 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2018/08/22 09:46:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2018/10/23 12:33:04 jperkin Exp $
2 2
3TORBVER= 6.0.8 3TORBVER= 6.0.8
4 4
5DISTNAME= v6.0.8-esr45.6.0 5DISTNAME= v6.0.8-esr45.6.0
6PKGNAME= tor-browser-${TORBVER} 6PKGNAME= tor-browser-${TORBVER}
7PKGREVISION= 14 7PKGREVISION= 14
8CATEGORIES= www 8CATEGORIES= www
9# Use OpenBSD distfile 9# Use OpenBSD distfile
10MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/} 10MASTER_SITES= ${MASTER_SITE_OPENBSD:=distfiles/tor-browser/}
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en 13HOMEPAGE= https://www.torproject.org/projects/torbrowser.html.en
14COMMENT= Tor Browser based on Firefox 14COMMENT= Tor Browser based on Firefox
@@ -20,34 +20,38 @@ DIST_SUBDIR= tor-browser @@ -20,34 +20,38 @@ DIST_SUBDIR= tor-browser
20EXTRACT_USING= bsdtar 20EXTRACT_USING= bsdtar
21WRKSRC= ${WRKDIR}/${DISTNAME:S/v/torb-/} 21WRKSRC= ${WRKDIR}/${DISTNAME:S/v/torb-/}
22 22
23DEPENDS+= tor-[0-9]*:../../net/tor 23DEPENDS+= tor-[0-9]*:../../net/tor
24 24
25# Remove hardcoded build directory. 25# Remove hardcoded build directory.
26SUBST_CLASSES+= fix-build-dir 26SUBST_CLASSES+= fix-build-dir
27SUBST_STAGE.fix-build-dir+= pre-configure 27SUBST_STAGE.fix-build-dir+= pre-configure
28SUBST_FILES.fix-build-dir+= .mozconfig 28SUBST_FILES.fix-build-dir+= .mozconfig
29SUBST_SED.fix-build-dir+= -e 's,mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@,,' 29SUBST_SED.fix-build-dir+= -e 's,mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@,,'
30 30
31MOZILLA_DIR= # empty 31MOZILLA_DIR= # empty
32 32
 33.include "../../mk/bsd.prefs.mk"
 34
33CONFIGURE_ARGS+= --enable-application=browser 35CONFIGURE_ARGS+= --enable-application=browser
34CONFIGURE_ARGS+= --disable-tor-browser-update 36CONFIGURE_ARGS+= --disable-tor-browser-update
35CONFIGURE_ARGS+= --disable-webrtc 37CONFIGURE_ARGS+= --disable-webrtc
36CONFIGURE_ARGS+= --disable-gio 38CONFIGURE_ARGS+= --disable-gio
37CONFIGURE_ARGS+= --disable-dbus 39CONFIGURE_ARGS+= --disable-dbus
38CONFIGURE_ARGS+= --disable-gnomeui 40CONFIGURE_ARGS+= --disable-gnomeui
39CONFIGURE_ARGS+= --disable-libnotify 41CONFIGURE_ARGS+= --disable-libnotify
 42.if ${OPSYS} != "SunOS"
40CONFIGURE_ARGS+= --enable-pie 43CONFIGURE_ARGS+= --enable-pie
 44.endif
41CONFIGURE_ARGS+= --enable-tor-data-in-home-dir 45CONFIGURE_ARGS+= --enable-tor-data-in-home-dir
42CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1 46CFLAGS+= -DTOR_BROWSER_DATA_IN_HOME_DIR=1
43CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1 47CFLAGS+= -DTOR_BROWSER_DATA_OUTSIDE_APP_DIR=1
44CFLAGS+= -fPIC 48CFLAGS+= -fPIC
45 49
46# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601 50# Avoid build failure from security/manager/ssl/src/nsNSSCallbacks.cpp:601
47CFLAGS+= -fpermissive 51CFLAGS+= -fpermissive
48 52
49# workaround for link of libxul.so etc. 53# workaround for link of libxul.so etc.
50LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib 54LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/tor-browser ${COMPILER_RPATH_FLAG}${PREFIX}/lib
51LDFLAGS.SunOS+= -lm 55LDFLAGS.SunOS+= -lm
52 56
53ALL_ENV+= MOZILLA_PKG_NAME=tor-browser 57ALL_ENV+= MOZILLA_PKG_NAME=tor-browser
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox45/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox45/Attic/mozilla-common.mk 2018/07/03 05:03:38 1.8
+++ pkgsrc/www/firefox45/Attic/mozilla-common.mk 2018/10/23 12:33:03 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.8 2018/07/03 05:03:38 adam Exp $ 1# $NetBSD: mozilla-common.mk,v 1.9 2018/10/23 12:33:03 jperkin Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
12.endif 12.endif
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -31,27 +31,29 @@ GCC_REQD+= 4.8 @@ -31,27 +31,29 @@ GCC_REQD+= 4.8
31# Fix for PR pkg/48152. 31# Fix for PR pkg/48152.
32CXXFLAGS+= -march=i586 32CXXFLAGS+= -march=i586
33# This is required for SSE2 code under i386. 33# This is required for SSE2 code under i386.
34CXXFLAGS+= -mstackrealign 34CXXFLAGS+= -mstackrealign
35.endif 35.endif
36 36
37CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 37CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
38CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 38CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
39CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 39CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
40CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure 40CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
41CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 41CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
42CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 42CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
43 43
 44.if ${OPSYS} != "SunOS"
44CONFIGURE_ARGS+= --enable-pie 45CONFIGURE_ARGS+= --enable-pie
 46.endif
45CONFIGURE_ARGS+= --disable-tests 47CONFIGURE_ARGS+= --disable-tests
46CONFIGURE_ARGS+= --disable-pedantic 48CONFIGURE_ARGS+= --disable-pedantic
47CONFIGURE_ARGS+= --enable-crypto 49CONFIGURE_ARGS+= --enable-crypto
48CONFIGURE_ARGS+= --with-pthreads 50CONFIGURE_ARGS+= --with-pthreads
49CONFIGURE_ARGS+= --disable-javaxpcom 51CONFIGURE_ARGS+= --disable-javaxpcom
50CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 52CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
51CONFIGURE_ARGS+= --disable-gstreamer 53CONFIGURE_ARGS+= --disable-gstreamer
52CONFIGURE_ARGS+= --enable-svg 54CONFIGURE_ARGS+= --enable-svg
53CONFIGURE_ARGS+= --enable-mathml 55CONFIGURE_ARGS+= --enable-mathml
54CONFIGURE_ARGS+= --enable-pango 56CONFIGURE_ARGS+= --enable-pango
55CONFIGURE_ARGS+= --enable-system-cairo 57CONFIGURE_ARGS+= --enable-system-cairo
56CONFIGURE_ARGS+= --enable-system-pixman 58CONFIGURE_ARGS+= --enable-system-pixman
57CONFIGURE_ARGS+= --with-system-libvpx 59CONFIGURE_ARGS+= --with-system-libvpx
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox52/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox52/mozilla-common.mk 2017/07/12 01:49:34 1.2
+++ pkgsrc/www/firefox52/mozilla-common.mk 2018/10/23 12:33:04 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.2 2017/07/12 01:49:34 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.3 2018/10/23 12:33:04 jperkin Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6# used by www/seamonkey/Makefile 6# used by www/seamonkey/Makefile
7 7
8.include "../../mk/bsd.prefs.mk" 8.include "../../mk/bsd.prefs.mk"
9 9
10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 10.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm 11BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
12 12
13# Enable Google widevine CDM. This requires external libwidevinecdm.so. 13# Enable Google widevine CDM. This requires external libwidevinecdm.so.
14#CONFIGURE_ARGS+= --enable-eme=widevine 14#CONFIGURE_ARGS+= --enable-eme=widevine
@@ -35,27 +35,29 @@ GCC_REQD+= 4.8 @@ -35,27 +35,29 @@ GCC_REQD+= 4.8
35# Fix for PR pkg/48152. 35# Fix for PR pkg/48152.
36CXXFLAGS+= -march=i586 36CXXFLAGS+= -march=i586
37# This is required for SSE2 code under i386. 37# This is required for SSE2 code under i386.
38CXXFLAGS+= -mstackrealign 38CXXFLAGS+= -mstackrealign
39.endif 39.endif
40 40
41CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 41CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
42CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 42CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
43CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 43CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
44CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure 44CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
45CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 45CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
46CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 46CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
47 47
 48.if ${OPSYS} != "SunOS"
48CONFIGURE_ARGS+= --enable-pie 49CONFIGURE_ARGS+= --enable-pie
 50.endif
49CONFIGURE_ARGS+= --disable-tests 51CONFIGURE_ARGS+= --disable-tests
50CONFIGURE_ARGS+= --with-pthreads 52CONFIGURE_ARGS+= --with-pthreads
51CONFIGURE_ARGS+= --enable-system-cairo 53CONFIGURE_ARGS+= --enable-system-cairo
52CONFIGURE_ARGS+= --enable-system-pixman 54CONFIGURE_ARGS+= --enable-system-pixman
53CONFIGURE_ARGS+= --with-system-libvpx 55CONFIGURE_ARGS+= --with-system-libvpx
54CONFIGURE_ARGS+= --enable-system-hunspell 56CONFIGURE_ARGS+= --enable-system-hunspell
55CONFIGURE_ARGS+= --enable-system-ffi 57CONFIGURE_ARGS+= --enable-system-ffi
56CONFIGURE_ARGS+= --with-system-icu 58CONFIGURE_ARGS+= --with-system-icu
57CONFIGURE_ARGS+= --with-system-nss 59CONFIGURE_ARGS+= --with-system-nss
58CONFIGURE_ARGS+= --with-system-nspr 60CONFIGURE_ARGS+= --with-system-nspr
59CONFIGURE_ARGS+= --with-system-jpeg 61CONFIGURE_ARGS+= --with-system-jpeg
60CONFIGURE_ARGS+= --with-system-zlib 62CONFIGURE_ARGS+= --with-system-zlib
61CONFIGURE_ARGS+= --with-system-bz2 63CONFIGURE_ARGS+= --with-system-bz2
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox60/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox60/Attic/mozilla-common.mk 2018/06/28 14:04:10 1.1
+++ pkgsrc/www/firefox60/Attic/mozilla-common.mk 2018/10/23 12:33:04 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.1 2018/06/28 14:04:10 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.2 2018/10/23 12:33:04 jperkin Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox60/Makefile 5# used by www/firefox60/Makefile
6 6
7HAS_CONFIGURE= yes 7HAS_CONFIGURE= yes
8CONFIGURE_ARGS+= --prefix=${PREFIX} 8CONFIGURE_ARGS+= --prefix=${PREFIX}
9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
10USE_LANGUAGES+= c99 c++ 10USE_LANGUAGES+= c99 c++
11UNLIMIT_RESOURCES+= datasize 11UNLIMIT_RESOURCES+= datasize
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14 14
@@ -41,27 +41,29 @@ GCC_REQD+= 4.9 @@ -41,27 +41,29 @@ GCC_REQD+= 4.9
41CXXFLAGS+= -march=i586 41CXXFLAGS+= -march=i586
42# This is required for SSE2 code under i386. 42# This is required for SSE2 code under i386.
43CXXFLAGS+= -mstackrealign 43CXXFLAGS+= -mstackrealign
44.endif 44.endif
45 45
46CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 46CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
47CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 47CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
48CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 48CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
49CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure 49CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}intl/icu/source/configure
50CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh 50CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
51CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh 51CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
52 52
53CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3 53CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
 54.if ${OPSYS} != "SunOS"
54CONFIGURE_ARGS+= --enable-pie 55CONFIGURE_ARGS+= --enable-pie
 56.endif
55CONFIGURE_ARGS+= --disable-tests 57CONFIGURE_ARGS+= --disable-tests
56CONFIGURE_ARGS+= --with-pthreads 58CONFIGURE_ARGS+= --with-pthreads
57# Mozilla Bug 1432751 59# Mozilla Bug 1432751
58#CONFIGURE_ARGS+= --enable-system-cairo 60#CONFIGURE_ARGS+= --enable-system-cairo
59CONFIGURE_ARGS+= --enable-system-pixman 61CONFIGURE_ARGS+= --enable-system-pixman
60CONFIGURE_ARGS+= --with-system-libvpx 62CONFIGURE_ARGS+= --with-system-libvpx
61# textproc/hunspell 1.3 is too old 63# textproc/hunspell 1.3 is too old
62#CONFIGURE_ARGS+= --enable-system-hunspell 64#CONFIGURE_ARGS+= --enable-system-hunspell
63CONFIGURE_ARGS+= --enable-system-ffi 65CONFIGURE_ARGS+= --enable-system-ffi
64CONFIGURE_ARGS+= --with-system-icu 66CONFIGURE_ARGS+= --with-system-icu
65CONFIGURE_ARGS+= --with-system-nss 67CONFIGURE_ARGS+= --with-system-nss
66CONFIGURE_ARGS+= --with-system-nspr 68CONFIGURE_ARGS+= --with-system-nspr
67CONFIGURE_ARGS+= --with-system-jpeg 69CONFIGURE_ARGS+= --with-system-jpeg