commit 82be6b58b081e39e69fbfeaf5badab621fc0e0c6
Author: Jan Palus <[email protected]>
Date: Thu Aug 12 14:32:56 2021 +0200
drop sysctl.h inclusion on all archs
mozjs52-x32.patch | 11 -----------
mozjs52.spec | 2 ++
sysctl_h.patch | 11 +++++++++++
3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/mozjs52.spec b/mozjs52.spec
index e3c5d95..ce80447 100644
--- a/mozjs52.spec
+++ b/mozjs52.spec
@@ -15,6 +15,7 @@ Patch2: system-virtualenv.patch
Patch3: include-configure-script.patch
Patch4: %{name}-x32.patch
Patch5: %{name}-cpp.patch
+Patch6: sysctl_h.patch
URL:
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
BuildRequires: autoconf2_13
BuildRequires: libstdc++-devel >= 6:4.4
@@ -69,6 +70,7 @@ Pliki nagłówkowe do biblioteki JavaScript.
%patch4 -p1
%endif
%patch5 -p1
+%patch6 -p1
%build
export PYTHON="%{__python}"
diff --git a/mozjs52-x32.patch b/mozjs52-x32.patch
index 3f4b17b..4fb4210 100644
--- a/mozjs52-x32.patch
+++ b/mozjs52-x32.patch
@@ -20,17 +20,6 @@
kernel=Kernel(canonical_kernel),
os=OS(canonical_os),
endianness=Endianness(endianness),
---- firefox-52.4.0esr/memory/mozjemalloc/jemalloc.c~ 2017-05-12
02:25:50.000000000 +0200
-+++ firefox-52.4.0esr/memory/mozjemalloc/jemalloc.c 2017-10-14
23:08:32.676380395 +0200
-@@ -331,7 +331,7 @@
- #endif
- #include <sys/time.h>
- #include <sys/types.h>
--#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
-+#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID) &&
!defined(__ILP32__)
- #include <sys/sysctl.h>
- #endif
- #include <sys/uio.h>
--- firefox-52.4.0esr/js/src/old-configure.in.djit 2017-10-16
21:07:31.353333333 +0200
+++ firefox-52.4.0esr/js/src/old-configure.in 2017-10-16 21:37:42.479999989
+0200
@@ -945,6 +945,9 @@ fi
diff --git a/sysctl_h.patch b/sysctl_h.patch
new file mode 100644
index 0000000..2203f8a
--- /dev/null
+++ b/sysctl_h.patch
@@ -0,0 +1,11 @@
+--- firefox-52.4.0esr/memory/mozjemalloc/jemalloc.c~ 2017-05-12
02:25:50.000000000 +0200
++++ firefox-52.4.0esr/memory/mozjemalloc/jemalloc.c 2017-10-14
23:08:32.676380395 +0200
+@@ -331,7 +331,7 @@
+ #endif
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#if !defined(MOZ_MEMORY_SOLARIS) && !defined(MOZ_MEMORY_ANDROID)
++#if 0
+ #include <sys/sysctl.h>
+ #endif
+ #include <sys/uio.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozjs52.git/commitdiff/82be6b58b081e39e69fbfeaf5badab621fc0e0c6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
