From 38ec09b42c7ed2ba12d63bf5060b55972846c0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 19 Jan 2021 12:18:22 -0300 Subject: [PATCH] mozjs52: remove package. --- srcpkgs/mozjs52-devel | 1 - .../patches/mozjs52-copy-headers.patch | 30 --------- .../patches/mozjs52-disable-mozglue.patch | 66 ------------------ .../mozjs52/patches/mozjs52-fix-soname.patch | 34 ---------- .../mozjs52-include-configure-script.patch | 48 ------------- srcpkgs/mozjs52/patches/mozjs52.pc.patch | 8 --- srcpkgs/mozjs52/template | 67 ------------------- srcpkgs/mozjs52/update | 1 - 8 files changed, 255 deletions(-) delete mode 120000 srcpkgs/mozjs52-devel delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch delete mode 100644 srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch delete mode 100644 srcpkgs/mozjs52/patches/mozjs52.pc.patch delete mode 100644 srcpkgs/mozjs52/template delete mode 100644 srcpkgs/mozjs52/update diff --git a/srcpkgs/mozjs52-devel b/srcpkgs/mozjs52-devel deleted file mode 120000 index c5eb332bc27..00000000000 --- a/srcpkgs/mozjs52-devel +++ /dev/null @@ -1 +0,0 @@ -mozjs52 \ No newline at end of file diff --git a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch b/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch deleted file mode 100644 index 69b216151e0..00000000000 --- a/srcpkgs/mozjs52/patches/mozjs52-copy-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8b2d7a77bfb4dbd513763501ed7e9722058ee9af Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -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 -. ---- - 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' % ( diff --git a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch b/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch deleted file mode 100644 index 8355cf4b0ea..00000000000 --- a/srcpkgs/mozjs52/patches/mozjs52-disable-mozglue.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7e6d628456af3e99ebcb9a01a27e1461585082a4 Mon Sep 17 00:00:00 2001 -From: Till Schneidereit -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 -. - -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') - diff --git a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch b/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch deleted file mode 100644 index a91107c1568..00000000000 --- a/srcpkgs/mozjs52/patches/mozjs52-fix-soname.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Laszlo Boszormenyi (GCS) -Date: Fri, 02 May 2014 22:20:45 +0200 -Subject: fix soname - -Add soname switch to linker, regardless of Operating System - -Bug-Debian: http://bugs.debian.org/746705 ---- - config/rules.mk | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: mozjs52-52.2.1~artful1/config/rules.mk -=================================================================== ---- mozjs52-52.2.1~artful1.orig/config/rules.mk -+++ mozjs52-52.2.1~artful1/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/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch b/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch deleted file mode 100644 index c24d7b157f3..00000000000 --- a/srcpkgs/mozjs52/patches/mozjs52-include-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4a06a1a6a71293decb83aee7adb74bc709493106 Mon Sep 17 00:00:00 2001 -From: Philip Chimento -Date: Wed, 5 Jul 2017 22:57:09 -0700 -Subject: [PATCH] build: Include configure script, be nicer about options - -A configure script is not included in the SpiderMonkey tarball by -default. Also, we have to account for JHbuild passing extra unknown -options like --disable-Werror. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1379540 ---- - js/src/configure | 9 +++++++++ - python/mozbuild/mozbuild/configure/__init__.py | 2 +- - python/mozbuild/mozbuild/configure/options.py | 6 +++++- - 3 files changed, 15 insertions(+), 2 deletions(-) - create mode 100755 js/src/configure - -diff --git a/python/mozbuild/mozbuild/configure/__init__.py b/python/mozbuild/mozbuild/configure/__init__.py -index 0fe640ca..09b460d3 100644 ---- a/python/mozbuild/mozbuild/configure/__init__.py -+++ b/python/mozbuild/mozbuild/configure/__init__.py -@@ -356,7 +356,7 @@ def run(self, path=None): - # All options should have been removed (handled) by now. - for arg in self._helper: - without_value = arg.split('=', 1)[0] -- raise InvalidOptionError('Unknown option: %s' % without_value) -+ print('Ignoring', without_value, ': Unknown option') - - # Run the execution queue - for func, args in self._execution_queue: -diff --git a/python/mozbuild/mozbuild/configure/options.py b/python/mozbuild/mozbuild/configure/options.py -index 4310c862..15bfe425 100644 ---- a/python/mozbuild/mozbuild/configure/options.py -+++ b/python/mozbuild/mozbuild/configure/options.py -@@ -402,7 +402,11 @@ def __init__(self, environ=os.environ, argv=sys.argv): - - def add(self, arg, origin='command-line', args=None): - assert origin != 'default' -- prefix, name, values = Option.split_option(arg) -+ try: -+ prefix, name, values = Option.split_option(arg) -+ except InvalidOptionError as e: -+ print('Ignoring', arg, ':', e) -+ return - if args is None: - args = self._extra_args - if args is self._extra_args and name in self._extra_args: - diff --git a/srcpkgs/mozjs52/patches/mozjs52.pc.patch b/srcpkgs/mozjs52/patches/mozjs52.pc.patch deleted file mode 100644 index 6d85bb05f4e..00000000000 --- a/srcpkgs/mozjs52/patches/mozjs52.pc.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/js/src/js.pc.in -+++ b/js/src/js.pc.in -@@ -8,4 +8,4 @@ Description: The Mozilla library for JavaScript - Version: @MOZILLA_VERSION@ - @PKGCONF_REQUIRES_PRIVATE@ - Libs: -L${libdir} -l@JS_LIBRARY_NAME@ --Cflags: -include ${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ -+Cflags: -include ${pc_sysrootdir}${includedir}/@JS_LIBRARY_NAME@/js/RequiredDefines.h -I${includedir}/@JS_LIBRARY_NAME@ diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template deleted file mode 100644 index 383767ea777..00000000000 --- a/srcpkgs/mozjs52/template +++ /dev/null @@ -1,67 +0,0 @@ -# Template file for 'mozjs52' -pkgname=mozjs52 -version=52.9.0 -revision=7 -wrksrc="firefox-${version}esr" -build_wrksrc="js/src" -build_style=gnu-configure -hostmakedepends="perl python pkg-config automake autoconf213 autoconf-archive which" -makedepends="icu-devel libffi-devel nspr-devel zlib-devel readline-devel" -depends="nspr>=4.13.1" -short_desc="Mozilla JavaScript interpreter and library (52.x series)" -maintainer="Enno Boland " -license="MPL-2.0" -homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz" -checksum=c01d09658c53c1b3a496e353a24dad03b26b81d3b1d099abc26a06f81c199dd6 -patch_args="-Np1" - -# Flags for gcc6.3 conceived by Arch Linux developers -CFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -CXXFLAGS="-fpermissive -fno-delete-null-pointer-checks -fno-tree-vrp -fno-strict-aliasing" -# Use BFD linker to avoid erroneous detection of llvm pr8927 with *-musl -LDFLAGS="-fuse-ld=bfd" -# Flags for gcc9.1 -CFLAGS+=" -Wno-format-overflow" -CXXFLAGS+=" -Wno-format-overflow" - -if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - makedepends+=" libatomic-devel" - LDFLAGS+=" -latomic" -fi - -do_configure() { - local _args - - if [ "$CROSS_BUILD" ]; then - export HOST_CFLAGS="-Os" - export HOST_CXXFLAGS="-Os" - _args+=" --target=$XBPS_CROSS_TRIPLET" - fi - - touch ${wrksrc}/js/src/configure - SHELL=/bin/bash PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --disable-jemalloc --disable-optimize --enable-ctypes \ - --enable-gcgenerational --enable-pie --enable-readline \ - --enable-shared-js --enable-system-ffi --enable-tests \ - --enable-threadsafe --enable-xterm-updates --with-intl-api \ - --with-system-icu --with-system-nspr --with-system-zlib \ - ${_args} -} - -post_install() { - mv $DESTDIR/usr/lib/libmozjs-52.so $DESTDIR/usr/lib/libmozjs-52.so.0 - ln -sr $DESTDIR/usr/lib/libmozjs-52.so.0 $DESTDIR/usr/lib/libmozjs-52.so -} - -mozjs52-devel_package() { - depends="nspr-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/js52-config - vmove usr/include - vmove "usr/lib/*.so" - vmove "usr/lib/*.ajs" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/mozjs52/update b/srcpkgs/mozjs52/update deleted file mode 100644 index a1c3f7e43b0..00000000000 --- a/srcpkgs/mozjs52/update +++ /dev/null @@ -1 +0,0 @@ -pkgname="mozjs"