From 98f21139b654084acafeaf7f21170cf158c6a729 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 29 Jun 2019 14:15:51 +0200 Subject: 20190629.1 global branch merge. Signed-off-by: Matteo Bernardini --- development/mozjs/README | 3 - development/mozjs/mozjs.SlackBuild | 143 --------------------- development/mozjs/mozjs.info | 10 -- .../patches/moz38-dont-hardcode-libc-soname.patch | 15 --- development/mozjs/slack-desc | 19 --- 5 files changed, 190 deletions(-) delete mode 100644 development/mozjs/README delete mode 100644 development/mozjs/mozjs.SlackBuild delete mode 100644 development/mozjs/mozjs.info delete mode 100644 development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch delete mode 100644 development/mozjs/slack-desc (limited to 'development/mozjs') diff --git a/development/mozjs/README b/development/mozjs/README deleted file mode 100644 index bd78678034..0000000000 --- a/development/mozjs/README +++ /dev/null @@ -1,3 +0,0 @@ -SpiderMonkey is Mozilla's JavaScript engine written in C and C++. It -is used in various Mozilla products, including Firefox, and is -available under the MPL2. diff --git a/development/mozjs/mozjs.SlackBuild b/development/mozjs/mozjs.SlackBuild deleted file mode 100644 index 2a9a440991..0000000000 --- a/development/mozjs/mozjs.SlackBuild +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh - -# Slackware build script for mozjs -# Copyright 2018 David Woodfall -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=mozjs -VERSION=${VERSION:-45.0.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -patch -p1 --verbose <$CWD/patches/moz38-dont-hardcode-libc-soname.patch - -cd js/src - -# Going with the gentoo ebuild options. They completely disable all -# optimisation so we'll see how that works out. -# --enable-optimize="-O2" \ -# They have also enabled thread safety. - -MOZ_MAKE_FLAGS="$SLKCFLAGS" \ -MOZ_OPTIMIZE_FLAGS="" \ -MOZ_DEBUG_FLAGS="" \ -HOST_OPTIMIZE_FLAGS="" \ -MODULE_OPTIMIZE_FLAGS="" \ -MOZ_PGO_OPTIMIZE_FLAGS="" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-jemalloc \ - --enable-threadsafe \ - --with-system-nspr \ - --enable-system-ffi \ - --enable-readline \ - --disable-optimize \ - --with-intl-api \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Get rid of any static libs -find $PKG -iname '*.a' -o -iname '*.ajs' -delete - -# We don't want to clobber the stock js185 so we'll rename 'js' to 'mozjs' etc. -( - cd $PKG/usr/bin - for bin in * - do - mv -v $bin moz$bin - done -) - -# Thanks to Arch -# Resolve symlinks so they donʼt point to $srcdir -for l in $(find "$PKG/usr/include/" -type l); do - cp --remove-destination $(readlink $l) $l -done - -# Fix to get elinks to build against it. Disabled for now. -#sed -i "s%%%" $PKG/usr/include/mozjs-45/mozilla/MathAlgorithms.h -#sed -i "s%%%" $PKG/usr/include/mozjs-45/js/Value.h -#sed -i "/#include /d" $PKG/usr/include/mozjs-45/js/Utility.h -#sed -i "/#include /d" $PKG/usr/include/mozjs-45/mozilla/Vector.h - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cd ../.. -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - INSTALL LICENSE README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/mozjs/mozjs.info b/development/mozjs/mozjs.info deleted file mode 100644 index 5e487beb0e..0000000000 --- a/development/mozjs/mozjs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="mozjs" -VERSION="45.0.2" -HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey" -DOWNLOAD="https://ftp.mozilla.org/pub/spidermonkey/releases/45.0.2/mozjs-45.0.2.tar.bz2" -MD5SUM="2ca34f998d8b5ea79d8616dd26b5fbab" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" diff --git a/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch b/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch deleted file mode 100644 index 708c749697..0000000000 --- a/development/mozjs/patches/moz38-dont-hardcode-libc-soname.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:21:16.764318254 -0500 -+++ b/testing/mozbase/mozinfo/mozinfo/mozinfo.py 2018-01-12 12:22:23.392069398 -0500 -@@ -93,10 +93,11 @@ - - if info['os'] == 'linux': - import ctypes -+ import ctypes.util - import errno - PR_SET_SECCOMP = 22 - SECCOMP_MODE_FILTER = 2 -- ctypes.CDLL("libc.so.6", use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) -+ ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True).prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, 0) - info['has_sandbox'] = ctypes.get_errno() == errno.EFAULT - else: - info['has_sandbox'] = True diff --git a/development/mozjs/slack-desc b/development/mozjs/slack-desc deleted file mode 100644 index 0f9f7248d2..0000000000 --- a/development/mozjs/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -mozjs: mozjs (Mozilla's JavaScript engine) -mozjs: -mozjs: SpiderMonkey is Mozilla's JavaScript engine written in C and C++. It -mozjs: is used in various Mozilla products, including Firefox, and is -mozjs: available under the MPL2. -mozjs: -mozjs: -mozjs: -mozjs: -mozjs: -mozjs: -- cgit v1.2.3