[arch-commits] Commit in (8 files)
Jan Steffens
heftig at archlinux.org
Mon Jul 30 14:09:48 UTC 2018
Date: Monday, July 30, 2018 @ 14:09:48
Author: heftig
Revision: 329675
js60
Added:
js60/
js60/repos/
js60/trunk/
js60/trunk/mozjs60-fix-soname.patch
(from rev 329672, js52/trunk/mozjs52-fix-soname.patch)
Modified:
js60/trunk/PKGBUILD
Deleted:
js60/trunk/mozjs52-copy-headers.patch
js60/trunk/mozjs52-disable-mozglue.patch
js60/trunk/mozjs52-fix-soname.patch
-------------------------------------+
js60/trunk/mozjs60-fix-soname.patch | 25 ++++++++++++
trunk/PKGBUILD | 33 +++++++----------
trunk/mozjs52-copy-headers.patch | 30 ---------------
trunk/mozjs52-disable-mozglue.patch | 66 ----------------------------------
trunk/mozjs52-fix-soname.patch | 34 -----------------
5 files changed, 40 insertions(+), 148 deletions(-)
Modified: js60/trunk/PKGBUILD
===================================================================
--- js52/trunk/PKGBUILD 2018-07-30 13:51:55 UTC (rev 329672)
+++ js60/trunk/PKGBUILD 2018-07-30 14:09:48 UTC (rev 329675)
@@ -1,8 +1,8 @@
# $Id$
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-pkgname=js52
-pkgver=52.9.0
+pkgname=js60
+pkgver=60.1.0
pkgrel=1
_ffver=${pkgver%%.*}
pkgdesc="JavaScript interpreter and libraries - Version $_ffver"
@@ -13,14 +13,10 @@
makedepends=(python2 zip autoconf2.13 mercurial)
_repo=https://hg.mozilla.org/mozilla-unified
source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}esr_RELEASE"
- mozjs52-copy-headers.patch
- mozjs52-disable-mozglue.patch
- mozjs52-fix-soname.patch
+ mozjs60-fix-soname.patch
mozjs52-include-configure-script.patch)
sha256sums=('SKIP'
- 'c5b3a88e4d10ef149aba6fc48d431db54ff266323fa22a5d549028fd794423cc'
- '5a84f02521f37de873991dd360a4c4bfdbdd2fb4a218e11be73f9cbbf02050e8'
- '728456fd9e66b69d6e0688c75e50091dc56735004ecf5f649212a83fe3087df1'
+ 'c792837930defe27355941080e9b80ec1d45003c097e4707860acc13d43bc519'
'd91a89acd88bfc747a255050757a0c17139bf5c3508c2e1c3c6bb2056786a344')
prepare() {
@@ -28,9 +24,7 @@
mkdir obj
# https://salsa.debian.org/gnome-team/mozjs52/tree/debian/master/debian/patches
- patch -Np1 -i ../mozjs52-fix-soname.patch
- patch -Np1 -i ../mozjs52-copy-headers.patch
- patch -Np1 -i ../mozjs52-disable-mozglue.patch
+ patch -Np1 -i ../mozjs60-fix-soname.patch
patch -Np1 -i ../mozjs52-include-configure-script.patch
}
@@ -39,10 +33,11 @@
--prefix=/usr
--disable-debug
--disable-debug-symbols
+ --disable-jemalloc
--disable-strip
- --enable-gold
- --enable-optimize="-O2"
- --enable-pie
+ --enable-hardening
+ --enable-linker=gold
+ --enable-optimize
--enable-posix-nspr-emulation
--enable-readline
--enable-release
@@ -55,10 +50,7 @@
cd mozilla-unified/obj
- unset CPPFLAGS
- CFLAGS+=' -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp'
- CXXFLAGS+=' -fno-delete-null-pointer-checks -fno-strict-aliasing -fno-tree-vrp'
- export CC=gcc CXX=g++ PYTHON=/usr/bin/python2
+ export PYTHON=/usr/bin/python2
sh ../js/src/configure "${configure_args[@]}"
make
@@ -68,6 +60,11 @@
local jstests_extra_args=(
--format=none
--exclude-random
+
+ # non262/Date/time-zone-2038-pst.js:43:5 Error: Assertion failed:
+ # got "Sat Mar 31 2040 00:00:00 GMT-0700 (PST)",
+ # expected "Sat Mar 31 2040 00:00:00 GMT-0700 (PDT)"
+ --exclude non262/Date/time-zone-2038-pst.js
) jittest_extra_args=(
--format=none
--timeout 300
Deleted: js60/trunk/mozjs52-copy-headers.patch
===================================================================
--- js52/trunk/mozjs52-copy-headers.patch 2018-07-30 13:51:55 UTC (rev 329672)
+++ js60/trunk/mozjs52-copy-headers.patch 2018-07-30 14:09:48 UTC (rev 329675)
@@ -1,30 +0,0 @@
-From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz at ubuntu.com>
-Date: Wed, 5 Jul 2017 22:45:59 -0700
-Subject: [PATCH] build: Copy headers on install instead of symlinking
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento at gmail.com>.
----
- python/mozbuild/mozbuild/backend/recursivemake.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
-index 132dcf94..33d489a6 100644
---- a/python/mozbuild/mozbuild/backend/recursivemake.py
-+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
-@@ -1307,11 +1307,11 @@ def _process_final_target_files(self, obj, files, backend_file):
- raise Exception("Wildcards are only supported in the filename part of "
- "srcdir-relative or absolute paths.")
-
-- install_manifest.add_pattern_symlink(basepath, wild, path)
-+ install_manifest.add_pattern_copy(basepath, wild, path)
- else:
-- install_manifest.add_pattern_symlink(f.srcdir, f, path)
-+ install_manifest.add_pattern_copy(f.srcdir, f, path)
- else:
-- install_manifest.add_symlink(f.full_path, dest)
-+ install_manifest.add_copy(f.full_path, dest)
- else:
- install_manifest.add_optional_exists(dest)
- backend_file.write('%s_FILES += %s\n' % (
Deleted: js60/trunk/mozjs52-disable-mozglue.patch
===================================================================
--- js52/trunk/mozjs52-disable-mozglue.patch 2018-07-30 13:51:55 UTC (rev 329672)
+++ js60/trunk/mozjs52-disable-mozglue.patch 2018-07-30 14:09:48 UTC (rev 329675)
@@ -1,66 +0,0 @@
-From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001
-From: Till Schneidereit <till at tillschneidereit.net>
-Date: Thu, 1 Oct 2015 12:59:09 +0200
-Subject: [PATCH] Disable MOZ_GLUE_IN_PROGRAM in stand-alone builds on all
- platforms
-
-Otherwise, build fails not being able to find HashBytes.
-
-Patch ported forward to mozjs52 by Philip Chimento
-<philip.chimento at gmail.com>.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=1176787
----
- js/src/old-configure.in | 23 ++++++++++++++---------
- mozglue/build/moz.build | 2 +-
- 2 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/js/src/old-configure.in b/js/src/old-configure.in
-index 1c5c9e21..ff0617e3 100644
---- a/js/src/old-configure.in
-+++ b/js/src/old-configure.in
-@@ -1623,16 +1623,21 @@ dnl ========================================================
- dnl = Enable jemalloc
- dnl ========================================================
-
--case "${OS_TARGET}" in
--Android|WINNT|Darwin)
-+dnl In stand-alone builds we always only want to link executables against mozglue.
-+if test "$JS_STANDALONE"; then
- MOZ_GLUE_IN_PROGRAM=
-- ;;
--*)
-- dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-- MOZ_GLUE_IN_PROGRAM=1
-- AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-- ;;
--esac
-+else
-+ case "${OS_TARGET}" in
-+ Android|WINNT|Darwin)
-+ MOZ_GLUE_IN_PROGRAM=
-+ ;;
-+ *)
-+ dnl On !Android !Windows !OSX, we only want to link executables against mozglue
-+ MOZ_GLUE_IN_PROGRAM=1
-+ AC_DEFINE(MOZ_GLUE_IN_PROGRAM)
-+ ;;
-+ esac
-+fi
-
- if test "$MOZ_MEMORY"; then
- if test "x$MOZ_DEBUG" = "x1"; then
-diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build
-index d2897477..e3be5a2b 100644
---- a/mozglue/build/moz.build
-+++ b/mozglue/build/moz.build
-@@ -6,7 +6,7 @@
-
- # Build mozglue as a shared lib on Windows, OSX and Android.
- # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
--if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
-+if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') and not CONFIG['JS_STANDALONE']:
- SharedLibrary('mozglue')
- else:
- Library('mozglue')
-
Deleted: js60/trunk/mozjs52-fix-soname.patch
===================================================================
--- js52/trunk/mozjs52-fix-soname.patch 2018-07-30 13:51:55 UTC (rev 329672)
+++ js60/trunk/mozjs52-fix-soname.patch 2018-07-30 14:09:48 UTC (rev 329675)
@@ -1,34 +0,0 @@
-diff --git a/config/rules.mk b/config/rules.mk
---- a/config/rules.mk
-+++ b/config/rules.mk
-@@ -418,7 +418,7 @@ endif # AIX
- #
- # Linux: add -Bsymbolic flag for components
- #
--ifeq ($(OS_ARCH),Linux)
-+#ifeq ($(OS_ARCH),Linux)
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
- endif
-@@ -426,7 +426,8 @@ ifdef LD_VERSION_SCRIPT
- EXTRA_DSO_LDOPTS += -Wl,--version-script,$(LD_VERSION_SCRIPT)
- EXTRA_DEPS += $(LD_VERSION_SCRIPT)
- endif
--endif
-+#endif
-+EXTRA_DSO_LDOPTS += -Wl,-soname,lib$(JS_LIBRARY_NAME).so.0
-
- ifdef SYMBOLS_FILE
- ifeq ($(OS_TARGET),WINNT)
-diff --git a/js/src/Makefile.in b/js/src/Makefile.in
---- a/js/src/Makefile.in
-+++ b/js/src/Makefile.in
-@@ -222,6 +222,8 @@ ifneq (,$(REAL_LIBRARY))
- endif
- ifneq (,$(SHARED_LIBRARY))
- $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
-+ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
-+ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- ifeq ($(OS_ARCH),Darwin)
- install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
- endif
Copied: js60/trunk/mozjs60-fix-soname.patch (from rev 329672, js52/trunk/mozjs52-fix-soname.patch)
===================================================================
--- js60/trunk/mozjs60-fix-soname.patch (rev 0)
+++ js60/trunk/mozjs60-fix-soname.patch 2018-07-30 14:09:48 UTC (rev 329675)
@@ -0,0 +1,25 @@
+diff --git i/js/src/build/Makefile.in w/js/src/build/Makefile.in
+index ee19104e0ef5..a0f06fd35a18 100644
+--- i/js/src/build/Makefile.in
++++ w/js/src/build/Makefile.in
+@@ -89,6 +89,8 @@ ifneq (,$(REAL_LIBRARY))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ $(SYSINSTALL) $(SHARED_LIBRARY) $(DESTDIR)$(libdir)
++ mv -f $(DESTDIR)$(libdir)/$(SHARED_LIBRARY) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY).0
++ ln -s $(SHARED_LIBRARY).0 $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ ifeq ($(OS_ARCH),Darwin)
+ install_name_tool -id $(abspath $(libdir)/$(SHARED_LIBRARY)) $(DESTDIR)$(libdir)/$(SHARED_LIBRARY)
+ endif
+diff --git i/js/src/build/moz.build w/js/src/build/moz.build
+index a7f5fa4ce8eb..726687c13fb0 100644
+--- i/js/src/build/moz.build
++++ w/js/src/build/moz.build
+@@ -23,6 +23,7 @@ if not CONFIG['JS_STANDALONE']:
+ if CONFIG['JS_SHARED_LIBRARY']:
+ GeckoSharedLibrary('js', linkage=None)
+ SHARED_LIBRARY_NAME = CONFIG['JS_LIBRARY_NAME']
++ LDFLAGS += ['-Wl,-soname,lib{}.so.0'.format(SHARED_LIBRARY_NAME)]
+ else:
+ Library('js')
+
More information about the arch-commits
mailing list