|
|
@@ -1,33 +1,36 @@
|
|
|
#% global hgdate 51702867d932
|
|
|
|
|
|
Summary: JavaScript interpreter and libraries
|
|
|
+Summary(ja): JavaScript インタプリタ及びライブラリ
|
|
|
Name: js
|
|
|
+Epoch: 1
|
|
|
Version: 1.8.5
|
|
|
-Release: 3%{?hgdate:.hg%{hgdate}}%{?_dist_release}
|
|
|
-# The sources are triple licensed, but when we link against readline which is
|
|
|
-# GPL, the result can only be GPL.
|
|
|
-%if 0%{?_without_readline:1}
|
|
|
+Release: 4%{?hgdate:.hg%{hgdate}}%{?_dist_release}
|
|
|
License: GPLv2+ or LGPLv2+ or MPLv1.1
|
|
|
-%else
|
|
|
-License: GPLv2+
|
|
|
-%endif
|
|
|
Group: Development/Languages
|
|
|
URL: http://www.mozilla.org/js/
|
|
|
+
|
|
|
Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
|
|
|
Patch0: js-1.8.5-64bit-big-endian.patch
|
|
|
Patch1: js-1.8.5-secondary-jit.patch
|
|
|
Patch2: js185-destdir.patch
|
|
|
-Patch3: js-1.8.5-configure.patch
|
|
|
-Patch4: js-1.8.5-537701.patch
|
|
|
-Patch5: js185-arm-nosoftfp.patch
|
|
|
-Provides: libjs = %{version}-%{release}
|
|
|
+#Patch3: js-1.8.5-configure.patch
|
|
|
+Patch3: js-1.8.5-537701.patch
|
|
|
+Patch4: js185-arm-nosoftfp.patch
|
|
|
+Patch5: js185-libedit.patch
|
|
|
+Patch6: 0001-Make-js-config.h-multiarch-compatible.patch
|
|
|
+
|
|
|
+Provides: libjs = %{version}-%{release}
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
-Buildrequires: nspr-devel >= 4.7, python, zip
|
|
|
-Buildrequires: readline-devel, ncurses-devel, autoconf213
|
|
|
-Epoch: 1
|
|
|
+BuildRequires: nspr-devel >= 4.7
|
|
|
+BuildRequires:, python
|
|
|
+BuildRequires: zip
|
|
|
+BuildRequires: libedit-devel
|
|
|
+BuildRequires: ncurses-devel
|
|
|
+BuildRequires: autoconf213
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
|
|
|
%description
|
|
|
JavaScript is the Netscape-developed object scripting language used in millions
|
|
|
@@ -38,10 +41,11 @@ with only mild differences from the published standard.
|
|
|
|
|
|
%package devel
|
|
|
Summary: Header files, libraries and development documentation for %{name}
|
|
|
+Summary(ja): %{name} のヘッダファイル、ライブラリ及び開発用ドキュメント
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
|
|
Requires: pkgconfig
|
|
|
-Requires: ncurses-devel readline-devel
|
|
|
+Requires: ncurses-devel
|
|
|
Provides: libjs-devel = %{version}-%{release}
|
|
|
|
|
|
%description devel
|
|
|
@@ -56,9 +60,11 @@ you will need to install %{name}-devel.
|
|
|
%patch0 -p2 -b .64bit-big-endian
|
|
|
%patch1 -p2 -b .secondary-jit
|
|
|
%patch2 -p0 -b .destdir
|
|
|
-%patch3 -p1 -b .version
|
|
|
-%patch4 -p1 -b .537701
|
|
|
-%patch5 -p1 -b .armhfp
|
|
|
+%patch3 -p1 -b .537701
|
|
|
+%patch4 -p1 -b .armhfp
|
|
|
+%patch5 -p1 -b .libedit
|
|
|
+%patch6 -p1 -b .multiarch
|
|
|
+
|
|
|
cd js
|
|
|
|
|
|
# Rm parts with spurios licenses, binaries
|
|
|
@@ -68,13 +74,6 @@ rm -rf src/ctypes/libffi src/t src/tests/src/jstests.jar src/tracevis src/v8
|
|
|
|
|
|
pushd src
|
|
|
autoconf-2.13
|
|
|
-%configure \
|
|
|
- --with-system-nspr \
|
|
|
- --enable-threadsafe \
|
|
|
-%if 0%{!?_without_readline:1}
|
|
|
- --enable-readline \
|
|
|
-%endif
|
|
|
-
|
|
|
popd
|
|
|
|
|
|
# Create pkgconfig file
|
|
|
@@ -94,10 +93,17 @@ EOF
|
|
|
|
|
|
|
|
|
%build
|
|
|
-cd js
|
|
|
-%{__make} %{?_smp_mflags} -C src
|
|
|
+cd js/src
|
|
|
+CPPFLAGS="$(pkg-config --cflags libedit)" \
|
|
|
+%configure \
|
|
|
+ --with-system-nspr \
|
|
|
+ --enable-threadsafe \
|
|
|
+ --enable-readline
|
|
|
+
|
|
|
+%{__make} %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
+%{__rm} -rf %{buildroot}
|
|
|
cd js
|
|
|
%{__make} -C src install DESTDIR=%{buildroot}
|
|
|
# We don't want this
|
|
|
@@ -146,6 +152,9 @@ popd
|
|
|
%{_includedir}/prmjtime.h
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Mar 23 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1:1.8.5-4
|
|
|
+- added Patch5 to build with libedit instead of readline
|
|
|
+
|
|
|
* Tue Dec 31 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1:1.8.5-3
|
|
|
- rebuild with VineSeed environment
|
|
|
|
inagaki