Use system virtualenv (should fix build on x32)

diff --git a/mozjs38-system-virtualenv.patch b/mozjs38-system-virtualenv.patch
new file mode 100644 (file)
index 0000000..debc326
--- /dev/null
+++ b/mozjs38-system-virtualenv.patch
@@ -0,0 +1,12 @@
+--- a/python/mozbuild/mozbuild/virtualenv.py~  2013-05-11 21:19:23.000000000 +0200
++++ b/python/mozbuild/mozbuild/virtualenv.py   2013-05-14 22:51:32.136719267 +0200
+@@ -37,8 +37,7 @@
+     @property
+     def virtualenv_script_path(self):
+         """Path to virtualenv's own populator script."""
+-        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
+-            'virtualenv.py')
++        return '/usr/bin/virtualenv-2'
+ 
+     @property
+     def python_path(self):

diff --git a/mozjs38.spec b/mozjs38.spec
index 7c390fbd80eb41c371239e9216da1af870fd492b..c46fa3dcdd4765974d74bcac833a101dc8ae0b08 100644 (file)
--- a/mozjs38.spec
+++ b/mozjs38.spec
@@ -10,10 +10,9 @@ Source0:     https://ftp.mozilla.org/pub/firefox/releases/%{version}esr/source/firef
 Patch0:                %{name}-shell-version.patch
 Patch1:                %{name}-pkg-config-version.patch
 Patch2:                %{name}-1269317.patch
+Patch3:                %{name}-system-virtualenv.patch
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Releases/38
-BuildRequires: libffi-devel >= 3.0.9
 BuildRequires: libffi-devel >= 5:3.0.9
-BuildRequires: libstdc++-devel
 BuildRequires: libstdc++-devel >= 6:4.4
 BuildRequires: nspr-devel >= 4.9.2
 BuildRequires: perl-base >= 1:5.6
@@ -61,6 +60,7 @@ Pliki nagłówkowe do biblioteki JavaScript.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 cd js/src