From 843c0994cba5c95e2a208fa1083b75ec4392cb02 Mon Sep 17 00:00:00 2001
From: leot <leot@pkgsrc.org>
Date: Fri, 24 May 2019 18:15:38 +0000
Subject: 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.
---
 lang/spidermonkey52/Makefile                              | 6 ++++--
 lang/spidermonkey52/distinfo                              | 4 ++--
 lang/spidermonkey52/patches/patch-js_src_old-configure_in | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'lang')

diff --git a/lang/spidermonkey52/Makefile b/lang/spidermonkey52/Makefile
index f4180581856..da4c981874c 100644
--- a/lang/spidermonkey52/Makefile
+++ b/lang/spidermonkey52/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2019/04/25 07:33:03 maya Exp $
+# $NetBSD: Makefile,v 1.16 2019/05/24 18:15:38 leot Exp $
 
 DISTNAME=	mozjs-52.7.4
-PKGREVISION=	8
+PKGREVISION=	9
 PKGNAME=	${DISTNAME:S/mozjs/spidermonkey52/}
 CATEGORIES=	lang
 MASTER_SITES=	https://queue.taskcluster.net/v1/task/YqG2fjJJSTGzGX090FjDYg/runs/0/artifacts/public/build/
@@ -24,6 +24,8 @@ CONFIGURE_ARGS+=	--with-system-nspr
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-pthreads
 CONFIGURE_ARGS+=	--disable-jemalloc
+CONFIGURE_ARGS+=	--disable-debug-symbols
+CONFIGURE_ARGS+=	--enable-strip
 
 CONFIGURE_DIRS=		js/src
 
diff --git a/lang/spidermonkey52/distinfo b/lang/spidermonkey52/distinfo
index e8de0272e09..e1cd49cc75a 100644
--- a/lang/spidermonkey52/distinfo
+++ b/lang/spidermonkey52/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2018/10/03 18:58:22 maya Exp $
+$NetBSD: distinfo,v 1.6 2019/05/24 18:15:38 leot Exp $
 
 SHA1 (mozjs-52.7.4.tar.bz2) = ff009853040bb46017204fda4ed69a79484fd321
 RMD160 (mozjs-52.7.4.tar.bz2) = 71ee71c2444d8b6a1b2b3c744c9f52a2b7129879
@@ -10,7 +10,7 @@ SHA1 (patch-config_gcc__hidden.h) = c2042035288e01601b6c240fb08c8a1f598b9dfd
 SHA1 (patch-intl_icu_source_configure) = 1ff1be8ca68566e153219e15b8db696afd08b746
 SHA1 (patch-js_src_gc_Memory.cpp) = b1bb0c3045163d586c0b4d731d0ed7c23f339f3c
 SHA1 (patch-js_src_jsnativestack.cpp) = 3d0b06ccc3e24b408b97d01faa7758353f2edc85
-SHA1 (patch-js_src_old-configure_in) = 707cdb8a8ff9abaa7017be10bd2c5727d05b605b
+SHA1 (patch-js_src_old-configure_in) = 4fd3df4abde94758429d943641e1bd7bad3ca926
 SHA1 (patch-js_src_tests_update-test262.sh) = 10d73d95f4b849090bccb8fe656df79cbcea89f3
 SHA1 (patch-js_src_threading_posix_Thread.cpp) = e490d04ed28ffd8b2e9901a24739ad19fe6759e0
 SHA1 (patch-js_src_wasm_WasmSignalHandlers.cpp) = fd9b836d35d71103c3d8b628a6fe7c446bd4c7da
diff --git a/lang/spidermonkey52/patches/patch-js_src_old-configure_in b/lang/spidermonkey52/patches/patch-js_src_old-configure_in
index f7044a1d681..a6590ffe40b 100644
--- a/lang/spidermonkey52/patches/patch-js_src_old-configure_in
+++ b/lang/spidermonkey52/patches/patch-js_src_old-configure_in
@@ -1,4 +1,4 @@
-$NetBSD: patch-js_src_old-configure_in,v 1.3 2018/05/19 13:00:56 youri Exp $
+$NetBSD: patch-js_src_old-configure_in,v 1.4 2019/05/24 18:15:38 leot Exp $
 
 2nd chunk:
 From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
@@ -31,7 +31,7 @@ Index: js/src/old-configure.in
 +        # Don't allow undefined symbols in libraries
 +        DSO_LDOPTS="$DSO_LDOPTS -Wl,-z,defs"
 +    fi
-+    LDFLAGS="$LDFLAGS -Wl,-z,wxneeded"
++    LDFLAGS="$LDFLAGS"
 +    MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
 +    MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
      ;;
-- 
cgit v1.2.3