Fri May 24 18:15:38 2019 UTC ()
spidermonkey52: Do not build with debug symbols and strip

configure forced to pass `-g' to CFLAGS and did not strip resulting binaries and
libraries. Pass `--disable-debug-symbols' and `--enable-strip' to respectively
address that.
Fix PR pkg/54228 reported by matt farnsworth.

While here, avoid to pass `-Wl,-z,wxneeded' to LDFLAGS on NetBSD.


(leot)
diff -r1.15 -r1.16 pkgsrc/lang/spidermonkey52/Makefile
diff -r1.5 -r1.6 pkgsrc/lang/spidermonkey52/distinfo
diff -r1.3 -r1.4 pkgsrc/lang/spidermonkey52/patches/patch-js_src_old-configure_in
cvs diff -r1.15 -r1.16 pkgsrc/lang/spidermonkey52/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/spidermonkey52/Attic/Makefile 2019/04/25 07:33:03 1.15
+++ pkgsrc/lang/spidermonkey52/Attic/Makefile 2019/05/24 18:15:38 1.16
@@ -1,39 +1,41 @@ @@ -1,39 +1,41 @@
1# $NetBSD: Makefile,v 1.15 2019/04/25 07:33:03 maya Exp $ 1# $NetBSD: Makefile,v 1.16 2019/05/24 18:15:38 leot Exp $
2 2
3DISTNAME= mozjs-52.7.4 3DISTNAME= mozjs-52.7.4
4PKGREVISION= 8 4PKGREVISION= 9
5PKGNAME= ${DISTNAME:S/mozjs/spidermonkey52/} 5PKGNAME= ${DISTNAME:S/mozjs/spidermonkey52/}
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/ 7MASTER_SITES= https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/52 11HOMEPAGE= https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/52
12COMMENT= Standalone JavaScript implementation in C (major version 52) 12COMMENT= Standalone JavaScript implementation in C (major version 52)
13LICENSE= mpl-2.0 13LICENSE= mpl-2.0
14 14
15HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= pkg-config perl gmake autoconf213 17USE_TOOLS+= pkg-config perl gmake autoconf213
18AUTOCONF_REQD= 2.13 18AUTOCONF_REQD= 2.13
19 19
20CONFIGURE_ARGS+= --prefix=${PREFIX} 20CONFIGURE_ARGS+= --prefix=${PREFIX}
21CONFIGURE_ARGS+= --enable-readline 21CONFIGURE_ARGS+= --enable-readline
22CONFIGURE_ARGS+= --with-system-icu 22CONFIGURE_ARGS+= --with-system-icu
23CONFIGURE_ARGS+= --with-system-nspr 23CONFIGURE_ARGS+= --with-system-nspr
24CONFIGURE_ARGS+= --with-system-zlib 24CONFIGURE_ARGS+= --with-system-zlib
25CONFIGURE_ARGS+= --with-pthreads 25CONFIGURE_ARGS+= --with-pthreads
26CONFIGURE_ARGS+= --disable-jemalloc 26CONFIGURE_ARGS+= --disable-jemalloc
 27CONFIGURE_ARGS+= --disable-debug-symbols
 28CONFIGURE_ARGS+= --enable-strip
27 29
28CONFIGURE_DIRS= js/src 30CONFIGURE_DIRS= js/src
29 31
30PKGCONFIG_OVERRIDE+= js/src/ctypes/libffi/libffi.pc.in 32PKGCONFIG_OVERRIDE+= js/src/ctypes/libffi/libffi.pc.in
31PKGCONFIG_OVERRIDE+= js/src/js.pc.in 33PKGCONFIG_OVERRIDE+= js/src/js.pc.in
32 34
33PYTHON_VERSIONS_ACCEPTED= 27 35PYTHON_VERSIONS_ACCEPTED= 27
34PYTHON_FOR_BUILD_ONLY= yes 36PYTHON_FOR_BUILD_ONLY= yes
35 37
36DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 38DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
37 39
38.if ${MACHINE_ARCH} == "i386" 40.if ${MACHINE_ARCH} == "i386"
39# Needs 8 byte atomics. 41# Needs 8 byte atomics.
cvs diff -r1.5 -r1.6 pkgsrc/lang/spidermonkey52/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/spidermonkey52/Attic/distinfo 2018/10/03 18:58:22 1.5
+++ pkgsrc/lang/spidermonkey52/Attic/distinfo 2019/05/24 18:15:38 1.6
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.5 2018/10/03 18:58:22 maya Exp $ 1$NetBSD: distinfo,v 1.6 2019/05/24 18:15:38 leot Exp $
2 2
3SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321 3SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321
4RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879 4RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879
5SHA512 (mozjs-52.7.4.tar.bz2) = 7381f251ca9a4983d181eee2198f89b30505a0de636020e52c0c5b174f4d5cd19ca851222b6d8013bb657f2f1ce1ffcb54816eb928e481be2c9242f918d0125e 5SHA512 (mozjs-52.7.4.tar.bz2) = 7381f251ca9a4983d181eee2198f89b30505a0de636020e52c0c5b174f4d5cd19ca851222b6d8013bb657f2f1ce1ffcb54816eb928e481be2c9242f918d0125e
6Size (mozjs-52.7.4.tar.bz2) = 30494311 bytes 6Size (mozjs-52.7.4.tar.bz2) = 30494311 bytes
7SHA1 (patch-CVE-2018-12387) = a0e3198e1009db01bb5a39220764e7dcdfd52591 7SHA1 (patch-CVE-2018-12387) = a0e3198e1009db01bb5a39220764e7dcdfd52591
8SHA1 (patch-build_moz.configure_init.configure) = 63ed71d4269e8fbf990f44eecadca796991d5c1f 8SHA1 (patch-build_moz.configure_init.configure) = 63ed71d4269e8fbf990f44eecadca796991d5c1f
9SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd 9SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd
10SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746 10SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746
11SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c 11SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c
12SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85 12SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85
13SHA1 (patch-js_src_old-configure_in) = 707cdb8a8ff9abaa7017be10bd2c5727d05b605b 13SHA1 (patch-js_src_old-configure_in) = 4fd3df4abde94758429d943641e1bd7bad3ca926
14SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3 14SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3
15SHA1 (patch-js_src_threading_posix_Thread.cpp) = e490d04ed28ffd8b2e9901a24739ad19fe6759e0 15SHA1 (patch-js_src_threading_posix_Thread.cpp) = e490d04ed28ffd8b2e9901a24739ad19fe6759e0
16SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = fd9b836d35d71103c3d8b628a6fe7c446bd4c7da 16SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = fd9b836d35d71103c3d8b628a6fe7c446bd4c7da
17SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 610f7457f6a1993d26fcccd5730113bb48926d99 17SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 610f7457f6a1993d26fcccd5730113bb48926d99
18SHA1 (patch-mfbt_Poison.cpp) = f4560e4552beeb70d0564e3fdfd908c5e0bd94c4 18SHA1 (patch-mfbt_Poison.cpp) = f4560e4552beeb70d0564e3fdfd908c5e0bd94c4
19SHA1 (patch-mfbt_tests_TestPoisonArea.cpp) = 054441d4618bf630be6d6e71babdcdaa884f533a 19SHA1 (patch-mfbt_tests_TestPoisonArea.cpp) = 054441d4618bf630be6d6e71babdcdaa884f533a
20SHA1 (patch-modules_fdlibm_src_math__private.h) = afa40802bfdb917d7906de486eb8882da426c9cf 20SHA1 (patch-modules_fdlibm_src_math__private.h) = afa40802bfdb917d7906de486eb8882da426c9cf
21SHA1 (patch-mozglue_build_moz.build) = f35ffa1a54ccc4cd1ed7983aac792e334c9169b1 21SHA1 (patch-mozglue_build_moz.build) = f35ffa1a54ccc4cd1ed7983aac792e334c9169b1
22SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = ffb59ddf2d95eb284d24dad3d3aedc7d7f5b5d96 22SHA1 (patch-python_mozbuild_mozbuild_backend_recursivemake.py) = ffb59ddf2d95eb284d24dad3d3aedc7d7f5b5d96
23SHA1 (patch-python_mozbuild_mozbuild_configure_constants.py) = aed1c08cecc29e29edc8ccee98d032546814d6e4 23SHA1 (patch-python_mozbuild_mozbuild_configure_constants.py) = aed1c08cecc29e29edc8ccee98d032546814d6e4
cvs diff -r1.3 -r1.4 pkgsrc/lang/spidermonkey52/patches/Attic/patch-js_src_old-configure_in (expand / switch to unified diff)

--- pkgsrc/lang/spidermonkey52/patches/Attic/patch-js_src_old-configure_in 2018/05/19 13:00:56 1.3
+++ pkgsrc/lang/spidermonkey52/patches/Attic/patch-js_src_old-configure_in 2019/05/24 18:15:38 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-js_src_old-configure_in,v 1.3 2018/05/19 13:00:56 youri Exp $ 1$NetBSD: patch-js_src_old-configure_in,v 1.4 2019/05/24 18:15:38 leot Exp $
2 2
32nd chunk: 32nd chunk:
4From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001 4From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
5From: Till Schneidereit <till@tillschneidereit.net> 5From: Till Schneidereit <till@tillschneidereit.net>
6Date: Thu, 1 Oct 2015 12:59:09 +0200 6Date: Thu, 1 Oct 2015 12:59:09 +0200
7Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms 7Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all platforms
8 8
9Index: js/src/old-configure.in 9Index: js/src/old-configure.in
10--- js/src/old-configure.in.orig 2018-04-28 01:04:03.000000000 +0000 10--- js/src/old-configure.in.orig 2018-04-28 01:04:03.000000000 +0000
11+++ js/src/old-configure.in 11+++ js/src/old-configure.in
12@@ -599,6 +599,11 @@ dnl System overrides of the defaults for 12@@ -599,6 +599,11 @@ dnl System overrides of the defaults for
13 dnl ======================================================== 13 dnl ========================================================
14  14
@@ -21,27 +21,27 @@ Index: js/src/old-configure.in @@ -21,27 +21,27 @@ Index: js/src/old-configure.in
21 *-darwin*) 21 *-darwin*)
22 MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' 22 MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
23 MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' 23 MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
24@@ -917,18 +922,34 @@ case "$target" in 24@@ -917,18 +922,34 @@ case "$target" in
25 if test "$LIBRUNPATH"; then 25 if test "$LIBRUNPATH"; then
26 DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" 26 DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
27 fi 27 fi
28- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(DSO_SONAME) -o $@' 28- MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(DSO_SONAME) -o $@'
29- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(DSO_SONAME) -o $@' 29- MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -Wl,-soname,$(DSO_SONAME) -o $@'
30+ if test "$GNU_LD"; then 30+ if test "$GNU_LD"; then
31+ # Don't allow undefined symbols in libraries 31+ # Don't allow undefined symbols in libraries
32+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs" 32+ DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
33+ fi 33+ fi
34+ LDFLAGS="$LDFLAGS -Wl,-z,wxneeded" 34+ LDFLAGS="$LDFLAGS"
35+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' 35+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
36+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@' 36+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
37 ;; 37 ;;
38  38
39 *-openbsd*) 39 *-openbsd*)
40- DLL_SUFFIX=".so.1.0" 40- DLL_SUFFIX=".so.1.0"
41+ if test "$SO_VERSION"; then 41+ if test "$SO_VERSION"; then
42+ DLL_SUFFIX=".so.$SO_VERSION" 42+ DLL_SUFFIX=".so.$SO_VERSION"
43+ else 43+ else
44+ DLL_SUFFIX=".so.1.0" 44+ DLL_SUFFIX=".so.1.0"
45+ fi 45+ fi
46 DSO_CFLAGS='' 46 DSO_CFLAGS=''
47 DSO_PIC_CFLAGS='-fPIC' 47 DSO_PIC_CFLAGS='-fPIC'