commit 73308a8042e437bce6c66a8384180fdc02c4eb4e
Author: Jan Rękorajski <[email protected]>
Date: Mon Dec 29 23:55:20 2014 +0100
- new, based on https://bugs.gentoo.org/show_bug.cgi?id=421655
js187-install.patch | 29 +++++++++++
js187-x32.patch | 25 +++++++++
js187.spec | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 196 insertions(+)
---
diff --git a/js187.spec b/js187.spec
new file mode 100644
index 0000000..f516401
--- /dev/null
+++ b/js187.spec
@@ -0,0 +1,142 @@
+# NOTE: JavaScript version is 1.8.7, implementation version is 1.0.0; what
should be package version?
+# Some paths (library name, .pc file) seem intentionally not conflict with js
< 1.8,
+# but some still do (includes path, js-config, js shell).
+# It's somehow messy, so let's put this version in separate js187 package for
now,
+# until upstream decides which way to go in the future.
+Summary: SpiderMonkey JavaScript 1.8.7 implementation
+Summary(pl.UTF-8): Implementacja SpiderMonkey języka JavaScript 1.8.7
+Name: js187
+Version: 1.0.0
+Release: 1
+License: MPL 1.1 or GPL v2+ or LGPL v2.1+
+Group: Libraries
+#Source0:
http://ftp.mozilla.org/pub/mozilla.org/js/%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+# Source0-md5: 9399466aa36e98e157cb3780c3f96dde
+Patch0: %{name}-install.patch
+Patch1: %{name}-x32.patch
+URL: http://www.mozilla.org/js/
+BuildRequires: libstdc++-devel
+BuildRequires: nspr-devel >= 4.7.0
+BuildRequires: perl-base >= 1:5.6
+BuildRequires: python >= 1:2.5
+BuildRequires: readline-devel
+BuildRequires: rpm-perlprov
+BuildRequires: rpmbuild(macros) >= 1.294
+BuildRequires: sed >= 4.0
+Requires: nspr >= 4.7.0
+Provides: js = 2:1.8.7
+Obsoletes: js < 2:1.8.7
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+JavaScript Reference Implementation (codename SpiderMonkey). The
+package contains JavaScript runtime (compiler, interpreter,
+decompiler, garbage collector, atom manager, standard classes) and
+small "shell" program that can be used interactively and with .js
+files to run scripts.
+
+%description -l pl.UTF-8
+Wzorcowa implementacja JavaScriptu (o nazwie kodowej SpiderMonkey).
+Pakiet zawiera środowisko uruchomieniowe (kompilator, interpreter,
+dekompilator, odśmiecacz, standardowe klasy) i niewielką powłokę,
+która może być używana interaktywnie lub z plikami .js do uruchamiania
+skryptów.
+
+%package devel
+Summary: Header files for JavaScript reference library
+Summary(pl.UTF-8): Pliki nagłówkowe do biblioteki JavaScript
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libstdc++-devel
+Requires: nspr-devel >= 4.7.0
+Provides: js-devel = 2:1.8.7
+Obsoletes: js-devel < 2:1.8.7
+
+%description devel
+Header files for JavaScript reference library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe do biblioteki JavaScript.
+
+%package static
+Summary: Static JavaScript reference library
+Summary(pl.UTF-8): Statyczna biblioteka JavaScript
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+Provides: js-static = 2:1.8.7
+Obsoletes: js-static < 2:1.8.7
+
+%description static
+Static version of JavaScript reference library.
+
+%description static -l pl.UTF-8
+Statyczna wersja biblioteki JavaScript.
+
+%prep
+%setup -q -n js-1.8.7
+%patch0 -p1
+%patch1 -p1
+
+sed -i -e 's/-O3//' js/src/Makefile.in js/src/config/Makefile.in
+
+%build
+cd js/src
+%configure2_13 \
+ --enable-readline \
+ --enable-threadsafe \
+ --enable-system-ffi \
+ --disable-methodjit \
+ --with-system-nspr
+
+%{__make} \
+ HOST_OPTIMIZE_FLAGS= \
+ MOZILLA_VERSION=%{version}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} -j1 -C js/src install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ MOZILLA_VERSION=%{version}
+
+# not installed by make install
+cp -aL js/src/dist/include/{ds,gc,js,mozilla,vm}
$RPM_BUILD_ROOT%{_includedir}/js
+
+# not installed by make install in new buildsystem
+install js/src/shell/js $RPM_BUILD_ROOT%{_bindir}
+
+# provide libjs.so for backward compability at build time
+# (don't provide libjs.so.1 as the libraries are not binary-compatible)
+ln -sf libmozjs187.so $RPM_BUILD_ROOT%{_libdir}/libjs.so
+ln -sf libmozjs187-1.0.a $RPM_BUILD_ROOT%{_libdir}/libjs.a
+
+# fix symlinks pointing to buildroot
+ln -sf libmozjs187.so.1.0 $RPM_BUILD_ROOT%{_libdir}/libmozjs187.so
+ln -sf libmozjs187.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libmozjs187.so.1.0
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc js/src/README.html
+%attr(755,root,root) %{_bindir}/js
+%attr(755,root,root) %{_libdir}/libmozjs187.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmozjs187.so.1.0
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/js-config
+%attr(755,root,root) %{_libdir}/libjs.so
+%attr(755,root,root) %{_libdir}/libmozjs187.so
+%{_includedir}/js
+%{_pkgconfigdir}/mozjs187.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libjs.a
+%{_libdir}/libmozjs187-1.0.a
diff --git a/js187-install.patch b/js187-install.patch
new file mode 100644
index 0000000..f595ec1
--- /dev/null
+++ b/js187-install.patch
@@ -0,0 +1,29 @@
+diff -uNr js-1.8.5.old/js/src/Makefile.in js-1.8.5/js/src/Makefile.in
+--- js-1.8.5.old/js/src/Makefile.in 2011-03-31 21:08:36.000000000 +0200
++++ js-1.8.5/js/src/Makefile.in 2012-01-18 15:03:30.706388915 +0100
+@@ -888,8 +888,8 @@
+ endif
+ endif
+
+-install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY)
+-ifneq (,$(LIBRARY))
+- $(SYSINSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+- mv -f $(DESTDIR)$(libdir)/$(LIBRARY) $(subst
$(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(LIBRARY))
++install:: $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(SHARED_LIBRARY)
$(IMPORT_LIBRARY)
++ifneq (,$(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
++ $(SYSINSTALL) $(filter-out %.$(LIBS_DESC_SUFFIX),$(LIBRARY))
$(DESTDIR)$(libdir)
++ mv -f $(DESTDIR)$(libdir)/$(filter-out
%.$(LIBS_DESC_SUFFIX),$(LIBRARY)) $(subst
$(STATIC_LIBRARY_NAME),mozjs187-$(SRCREL_ABI_VERSION),$(DESTDIR)$(libdir)/$(filter-out
%.$(LIBS_DESC_SUFFIX),$(LIBRARY)))
+ endif
+ ifneq (,$(SHARED_LIBRARY))
+ ifeq (,$(HOST_BIN_SUFFIX))
+@@ -965,10 +965,10 @@
+ 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/js187-x32.patch b/js187-x32.patch
new file mode 100644
index 0000000..f14a269
--- /dev/null
+++ b/js187-x32.patch
@@ -0,0 +1,25 @@
+--- a/js/src/jslock.cpp 2012-04-06 16:24:51.000000000 -0500
++++ b/js/src/jslock.cpp 2012-06-21 20:57:00.877937542 -0500
+@@ -150,17 +150,22 @@
+
+ static JS_ALWAYS_INLINE int
+ NativeCompareAndSwap(volatile jsword *w, jsword ov, jsword nv)
+ {
+ unsigned int res;
+
+ __asm__ __volatile__ (
+ "lock\n"
++/* GCC's x32 abi support */
++#if defined(__LP64__)
+ "cmpxchgq %2, (%1)\n"
++#else
++ "cmpxchg %2, (%1)\n"
++#endif
+ "sete %%al\n"
+ "movzbl %%al, %%eax\n"
+ : "=a" (res)
+ : "r" (w), "r" (nv), "a" (ov)
+ : "cc", "memory");
+ return (int)res;
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/js187.git/commitdiff/73308a8042e437bce6c66a8384180fdc02c4eb4e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
