Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=53f1be86000b103a00549a8e0c0e3f92fb27f0b7
commit 53f1be86000b103a00549a8e0c0e3f92fb27f0b7 Author: crazy <[email protected]> Date: Thu Dec 24 04:47:49 2015 +0100 spidermonkey-17.0.0-1-x86_64 * Version bump * well strange package.. * the version we got is deprecated forever * this one is at least from 2013 .. * removed custom *.pc file * removed symlinks * added patch to fix issues I found diff --git a/source/base/spidermonkey/FrugalBuild b/source/base/spidermonkey/FrugalBuild index 3bfab40..d2d626a 100644 --- a/source/base/spidermonkey/FrugalBuild +++ b/source/base/spidermonkey/FrugalBuild @@ -1,52 +1,44 @@ # Compiling time: 0.14 SBU -# Maintainer: Janos Kovacs <[email protected]> +# Maintainer: crazy <[email protected]> pkgname=spidermonkey -pkgver=1.8.5 -pkgrel=5 +pkgver=17.0.0 +pkgrel=1 pkgdesc="Mozilla's C implementation of JavaScript." url="http://www.mozilla.org/js/spidermonkey/"; license="GPL" -depends=('glibc>=2.22-3' 'nspr>=4.10.5') -makedepends=('zip') +depends=('glibc>=2.22-3' 'nspr>=4.11-3' 'zlib>=1.2.8-3' 'libstdc++>=5.3.0-2' \ + 'readline>=6.3-7' 'ncurses>=6.0-4' 'libffi>=3.2.1') +makedepends=('zip' 'perl>=5.22.1') archs=('i686' 'x86_64' 'arm') groups=('base') -up2date="lynx -dump http://ftp.mozilla.org/pub/mozilla.org/js/ | grep js-[0-9\.]*\.tar.gz | sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" -source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz destdir.patch) -sha1sums=('52a01449c48d7a117b35f213d3e4263578d846d6' \ - 'd4045fa44d54e7198ae2ed2d6d3368f9ff0adaee') +options+=('force') +up2date="$pkgver" ## no way to get something valid +source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz \ + mozjs-fixes-1.patch) +sha1sums=('7805174898c34e5d3c3b256117af9944ba825c89' \ + 'fecd9d1bcc153c2ce58eb7e451acba41df3d2c2a') if [ "$CARCH" = "arm" ]; then - Fconfopts="--with-cpu-arch=armv5te" + Fconfopts="--with-cpu-arch=armv5te" ## ?!? fi build() { - unset MAKEFLAGS - Fcd js-$pkgver/js/src - Fbuild --with-system-nspr --enable-threadsafe -# Create pkgconfig file -cat > libjs.pc << 'EOF' -prefix=/usr -exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include - -Name: libjs -Description: JS library -Requires: nspr >= 4.8 -Version: 1.8.5 -Libs: -L${libdir} -ljs -Cflags: -DXP_UNIX=1 -DJS_THREADSAFE=1 -I${includedir}/js -EOF - install -m 0644 libjs.pc $Fdestdir/usr/lib/pkgconfig/ || Fdie - install -m 0755 shell/js ${Fdestdir}/usr/bin || Fdie - - # For compatibility - pushd $Fdestdir/usr/lib - ln -s libmozjs185.so.1.0 libmozjs.so.1 || Fdie - ln -s libmozjs185.so.1.0 libjs.so.1 || Fdie - ln -s libmozjs185.so libmozjs.so || Fdie - ln -s libmozjs185.so libjs.so || Fdie + + Fcd mozjs$pkgver + Fpatchall + + cd js/src || Fdie + Fconf \ + --with-system-nspr \ + --enable-threadsafe \ + --enable-jemalloc \ + --enable-system-ffi \ + --enable-readline + make || Fdie + make DESTDIR=$Fdestdir install || Fdie + } + # optimization OK diff --git a/source/base/spidermonkey/destdir.patch b/source/base/spidermonkey/destdir.patch deleted file mode 100644 index 4b7d99d..0000000 --- a/source/base/spidermonkey/destdir.patch +++ /dev/null @@ -1,16 +0,0 @@ -#https://bugzilla.mozilla.org/show_bug.cgi?id=628723 - ---- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700 -+++ Makefile.in 2011-04-10 04:21:58.088607992 -0700 -@@ -888,8 +888,8 @@ - ifeq (,$(HOST_BIN_SUFFIX)) - mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) - @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) -- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) -- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) -+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) -+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) - endif - endif - ifneq (,$(IMPORT_LIBRARY)) - diff --git a/source/base/spidermonkey/mozjs-fixes-1.patch b/source/base/spidermonkey/mozjs-fixes-1.patch new file mode 100644 index 0000000..922d4c2 --- /dev/null +++ b/source/base/spidermonkey/mozjs-fixes-1.patch @@ -0,0 +1,81 @@ +diff -Naur mozjs17.0.0/js/src/config/milestone.pl mozjs17.0.0-fix/js/src/config/milestone.pl +--- mozjs17.0.0/js/src/config/milestone.pl 2013-02-11 23:33:22.000000000 +0100 ++++ mozjs17.0.0-fix/js/src/config/milestone.pl 2015-12-24 04:03:33.138709959 +0100 +@@ -55,7 +55,7 @@ + # + my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE); + +-if (defined(@TEMPLATE_FILE)) { ++if (@TEMPLATE_FILE) { + my $TFILE; + + foreach $TFILE (@TEMPLATE_FILE) { +diff -Naur mozjs17.0.0/js/src/js-config.in mozjs17.0.0-fix/js/src/js-config.in +--- mozjs17.0.0/js/src/js-config.in 2013-03-25 21:34:20.000000000 +0100 ++++ mozjs17.0.0-fix/js/src/js-config.in 2015-12-24 04:03:07.978075592 +0100 +@@ -2,7 +2,7 @@ + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. +-#filter substitution ++%filter substitution + + prefix='@prefix@' + mozilla_version='@MOZILLA_VERSION@' +diff -Naur mozjs17.0.0/js/src/jsval.h mozjs17.0.0-fix/js/src/jsval.h +--- mozjs17.0.0/js/src/jsval.h 2013-03-25 21:34:20.000000000 +0100 ++++ mozjs17.0.0-fix/js/src/jsval.h 2015-12-24 04:02:38.957343904 +0100 +@@ -304,7 +304,6 @@ + int32_t i32; + uint32_t u32; + JSWhyMagic why; +- jsuword word; + } payload; + } s; + double asDouble; +diff -Naur mozjs17.0.0/js/src/Makefile.in mozjs17.0.0-fix/js/src/Makefile.in +--- mozjs17.0.0/js/src/Makefile.in 2013-03-25 21:34:20.000000000 +0100 ++++ mozjs17.0.0-fix/js/src/Makefile.in 2015-12-24 04:05:31.782701334 +0100 +@@ -778,7 +778,7 @@ + + $(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk + $(RM) [email protected] +- $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > [email protected] \ ++ $(PYTHON) $(topsrcdir)/config/Preprocessor.py --marker="%" $(JS_CONFIG_SUBSTITUTIONS) $< > [email protected] \ + && mv [email protected] $@ && chmod +x $@ + + SCRIPTS = $(JS_CONFIG_NAME) +@@ -788,7 +788,7 @@ + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@ + + install:: $(LIBRARY_NAME).pc +- $(SYSINSTALL) $^ $(DESTDIR)$(libdir)/pkgconfig ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(libdir)/pkgconfig + + ###################################################### + # BEGIN SpiderMonkey header installation +@@ -836,19 +836,19 @@ + # + + install:: $(INSTALLED_HEADERS) +- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE) ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE) + + install:: $(EXPORTS_ds) +- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/ds ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/ds + + install:: $(EXPORTS_gc) +- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/gc ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/gc + + install:: $(EXPORTS_js) +- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/js ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/js + + install:: $(EXPORTS_mozilla) +- $(SYSINSTALL) $^ $(DESTDIR)$(includedir)/$(MODULE)/mozilla ++ $(SYSINSTALL) -m 0644 $^ $(DESTDIR)$(includedir)/$(MODULE)/mozilla + + # + # END SpiderMonkey header installation _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
