Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=18427a7bbe0951632a01252ecb19b4028b9ca0e3

commit 18427a7bbe0951632a01252ecb19b4028b9ca0e3
Author: bouleetbil <[email protected]>
Date:   Tue Jan 3 10:19:48 2012 +0100

spidermonkey-1.8.5-2-x86_64
*added some fix

diff --git a/source/lib/spidermonkey/FrugalBuild 
b/source/lib/spidermonkey/FrugalBuild
index e6589a5..1f3e752 100644
--- a/source/lib/spidermonkey/FrugalBuild
+++ b/source/lib/spidermonkey/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=spidermonkey
pkgver=1.8.5
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla's C implementation of JavaScript."
url="http://www.mozilla.org/js/spidermonkey/";
license="GPL"
@@ -12,8 +12,9 @@ makedepends=('zip')
archs=('i686' 'x86_64' 'arm')
groups=('lib')
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)
-sha1sums=('52a01449c48d7a117b35f213d3e4263578d846d6')
+source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz 
destdir.patch)
+sha1sums=('52a01449c48d7a117b35f213d3e4263578d846d6' \
+          'd4045fa44d54e7198ae2ed2d6d3368f9ff0adaee')

build() {
unset MAKEFLAGS
@@ -33,7 +34,15 @@ 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/
+       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
}

# optimization OK
diff --git a/source/lib/spidermonkey/destdir.patch 
b/source/lib/spidermonkey/destdir.patch
new file mode 100644
index 0000000..4b7d99d
--- /dev/null
+++ b/source/lib/spidermonkey/destdir.patch
@@ -0,0 +1,16 @@
+#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))
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to