From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 1 May 2020 09:01:03 +0000 (+0200)
Subject: Revert "- rust is not needed tro build pure C++ library", wrong rep
X-Git-Tag: auto/th/mozjs60-60.9.0-2~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ad25e284f0b15ee43d31419bac0497ce203bbefa;p=packages%2Fmozjs60.git

Revert "- rust is not needed tro build pure C++ library", wrong rep

This reverts commit 74618235f4e623e812a5b3e4ac52533e710a1e32.
---

diff --git a/mozjs68.spec b/mozjs68.spec
deleted file mode 100644
index 6f99979..0000000
--- a/mozjs68.spec
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Conditional build:
-%bcond_without	tests	# tests build
-
-Summary:	SpiderMonkey 68 - JavaScript implementation
-Summary(pl.UTF-8):	SpiderMonkey 68 - implementacja języka JavaScript
-Name:		mozjs68
-Version:	68.7.0
-Release:	1
-License:	MPL v2.0
-Group:		Libraries
-#Source0:	http://ftp.gnome.org/pub/gnome/teams/releng/tarballs-needing-help/mozjs/mozjs-%{version}.tar.bz2
-Source0:	http://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-# Source0-md5:	a3e8676285f4fd7834ac16b1fee4e20c
-Patch0:		copy-headers.patch
-Patch1:		system-virtualenv.patch
-Patch2:		include-configure-script.patch
-Patch3:		x32.patch
-Patch4:		no-rust.patch
-URL:		https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
-BuildRequires:	autoconf2_13 >= 2.13
-# "TestWrappingOperations.cpp:27:1: error: non-constant condition for static assertion" with -fwrapv on gcc 6 and 7
-%{?with_tests:BuildRequires:	gcc-c++ >= 6:8}
-BuildRequires:	libicu-devel >= 59.1
-BuildRequires:	libstdc++-devel >= 6:4.4
-BuildRequires:	nspr-devel >= 4.19
-BuildRequires:	perl-base >= 1:5.6
-BuildRequires:	pkgconfig
-BuildRequires:	python >= 1:2.5
-BuildRequires:	python-virtualenv >= 1.9.1-4
-BuildRequires:	readline-devel
-BuildRequires:	rpm-perlprov
-BuildRequires:	rpmbuild(macros) >= 1.294
-BuildRequires:	zlib-devel >= 1.2.3
-Requires:	nspr >= 4.19
-Requires:	zlib >= 1.2.3
-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.19
-
-%description devel
-Header files for JavaScript reference library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe do biblioteki JavaScript.
-
-%prep
-%setup -q -n firefox-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-%build
-export PYTHON="%{__python}"
-export AUTOCONF="%{_bindir}/autoconf2_13"
-export SHELL="/bin/sh"
-cd js/src
-mkdir -p obj
-cd obj
-
-%define configuredir ".."
-%configure2_13 \
-	--enable-gcgenerational \
-	--disable-jemalloc \
-	--enable-readline \
-	--enable-shared-js \
-	%{!?with_tests:--disable-tests} \
-	--enable-threadsafe \
-	--with-intl-api \
-	--with-system-icu \
-	--with-system-nspr \
-	--with-system-zlib
-
-%{__make} \
-	HOST_OPTIMIZE_FLAGS= \
-	MODULE_OPTIMIZE_FLAGS= \
-	MOZ_OPTIMIZE_FLAGS="-freorder-blocks" \
-	MOZ_PGO_OPTIMIZE_FLAGS= \
-	MOZILLA_VERSION=%{version}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-cd js/src/obj
-
-%{__make} -C js/src install \
-    DESTDIR=$RPM_BUILD_ROOT \
-    MOZILLA_VERSION=%{version}
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.ajs
-
-%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}/js68
-%attr(755,root,root) %{_libdir}/libmozjs-68.so
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/js68-config
-%{_includedir}/mozjs-68
-%{_pkgconfigdir}/mozjs-68.pc
diff --git a/no-rust.patch b/no-rust.patch
deleted file mode 100644
index 9c5df9c..0000000
--- a/no-rust.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- firefox-68.7.0/js/moz.configure~	2020-04-03 21:29:56.000000000 +0200
-+++ firefox-68.7.0/js/moz.configure	2020-05-01 10:20:08.759893678 +0200
-@@ -18,11 +18,6 @@
- option(env='JS_STANDALONE', default=building_js,
-        help='Reserved for internal use')
- 
--include('../build/moz.configure/rust.configure',
--        when='--enable-compile-environment')
--include('../build/moz.configure/bindgen.configure',
--        when='--enable-compile-environment')
--
- @depends('JS_STANDALONE')
- def js_standalone(value):
-     if value: