[arch-commits] Commit in spidermonkey/trunk (PKGBUILD spidermonkey-Makefile.patch)
Eric Bélanger
eric at archlinux.org
Fri Jul 24 04:03:06 UTC 2009
Date: Friday, July 24, 2009 @ 00:03:05
Author: eric
Revision: 47555
upgpkg: spidermonkey 1.7.0-2
Added missing include file (close FS#15626), removed force option
Added:
spidermonkey/trunk/spidermonkey-Makefile.patch
Modified:
spidermonkey/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 23 +++++++++++------------
spidermonkey-Makefile.patch | 22 ++++++++++++++++++++++
2 files changed, 33 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-07-24 02:47:07 UTC (rev 47554)
+++ PKGBUILD 2009-07-24 04:03:05 UTC (rev 47555)
@@ -3,27 +3,26 @@
pkgname=spidermonkey
pkgver=1.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla's C implementation of JavaScript."
arch=("i686" "x86_64")
url="http://www.mozilla.org/js/spidermonkey/"
license=('MPL' 'GPL' 'LGPL')
depends=('nspr')
-options=('!makeflags' 'force')
+options=('!makeflags')
source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \
- "spidermonkey-1.7-threadsafe.patch")
-md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f')
+ "spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch")
+md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f'\
+ '161d4c0f2c604d15cba29dab60b1f7a7')
-build()
-{
- cd $startdir/src/js/src
+build() {
+ cd "$srcdir/js/src"
+ patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1
+ sed -i 's|include|include/js|' rules.mk || return 1
# fix for the lib location
[ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1)
# patch Makefile for threadsafe support with native nspr
- patch -p2 -i $startdir/src/spidermonkey-1.7-threadsafe.patch || return 1
+ patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1
# build - threadsafe
- make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST=$startdir/pkg/usr all export || return 1
- # install
- mkdir -p $startdir/pkg/usr/include/js
- mv $startdir/pkg/usr/include/*.h $startdir/pkg/usr/include/js/
+ make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1
}
Added: spidermonkey-Makefile.patch
===================================================================
--- spidermonkey-Makefile.patch (rev 0)
+++ spidermonkey-Makefile.patch 2009-07-24 04:03:05 UTC (rev 47555)
@@ -0,0 +1,22 @@
+*** Makefile.ref.orig 2009-02-16 09:56:29.000000000 -0600
+--- Makefile.ref 2009-02-16 09:58:59.000000000 -0600
+***************
+*** 169,184 ****
+--- 169,185 ----
+ jstypes.h \
+ jsprvtd.h \
+ jspubtd.h \
+ jsregexp.h \
+ jsscan.h \
+ jsscope.h \
+ jsscript.h \
+ jsstr.h \
++ jsutil.h \
+ jsxdrapi.h \
+ jsxml.h \
+ $(NULL)
+
+ API_HFILES = \
+ jsapi.h \
+ jsdbgapi.h \
+ $(NULL)
More information about the arch-commits
mailing list