MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-01-27 12:01:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

nspr: upgrade 4.35 -> 4.36

Browse Source 
* Refresh patches.
* Drop 0001-Fix-Wincompatible-function-pointer-types.patch as the issue
  has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2024-12-31 12:23:09 +08:00 committed by Khem Raj
parent 0141277159
commit bdb41e2659
No known key found for this signature in database
GPG Key ID: BB053355919D3314
8 changed files with 72 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
View File

@ -1,39 +0,0 @@
From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 18 Jan 2023 13:04:56 -0800
Subject: [PATCH] Fix -Wincompatible-function-pointer-types
Fixes warnings with clang16
testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types]
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
pr/tests/testfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
index 79d8a05..42aa6a7 100644
--- a/pr/tests/testfile.c
+++ b/pr/tests/testfile.c
@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type,
if (native_thread) {
#if defined(_PR_PTHREADS)
pthread_t tid;
- if (!pthread_create(&tid, NULL, start, arg)) {
+ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) {
return((PRThread *) tid);
}
else {
@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void)
thrarg.done= 0;
t = create_new_thread(PR_USER_THREAD,
- DirTest, &thrarg,
+ (void (*)(void *))DirTest, &thrarg,
PR_PRIORITY_NORMAL,
PR_LOCAL_THREAD,
PR_UNJOINABLE_THREAD,
--
2.39.1

25
meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch → meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
View File

@ -1,5 +1,7 @@
Author: Andrei Gherzan <andrei@gherzan.ro>
Date: Thu Feb 9 00:03:38 2012 +0200
From 63eb483f7feb05917402731d8f21b396630ef202 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei@gherzan.ro>
Date: Thu, 9 Feb 2012 00:03:38 +0200
Subject: [PATCH] remove rpath from tests
Avoid QA warnings by removing hardcoded rpath from binaries.
@ -8,14 +10,18 @@ WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-p
in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
[...]
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Upstream-Status: Pending
Index: nspr/pr/tests/Makefile.in
===================================================================
--- nspr.orig/pr/tests/Makefile.in
+++ nspr/pr/tests/Makefile.in
@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
---
pr/tests/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
index 20e2f99..56c73e1 100644
--- a/pr/tests/Makefile.in
+++ b/pr/tests/Makefile.in
@@ -260,7 +260,7 @@ ifeq ($(OS_ARCH), SunOS)
endif # SunOS
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
@ -24,3 +30,6 @@ Index: nspr/pr/tests/Makefile.in
ifeq ($(USE_PTHREADS),1)
EXTRA_LIBS = -lpthread
endif
--
2.25.1

30
meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch → meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
View File

@ -1,21 +1,24 @@
Fix build failure on x86_64
From f68f2535e98231ab362b6bbbe7cc4718b2c72aa9 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 31 Dec 2024 10:25:15 +0800
Subject: [PATCH] Fix build failure on x86_64
When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
opposite logic before.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Upstream-Status: Pending
---
configure.in | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Index: nspr/configure.in
===================================================================
--- nspr.orig/configure.in
+++ nspr/configure.in
@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
configure.in | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/configure.in b/configure.in
index 1a3e489..04419d9 100644
--- a/configure.in
+++ b/configure.in
@@ -1590,28 +1590,24 @@ tools are selected during the Xcode/Developer Tools installation.])
PR_MD_ASFILES=os_Linux_ia64.s
;;
x86_64)
@ -49,4 +52,7 @@ Index: nspr/configure.in
- PR_MD_ASFILES=os_Linux_ppc.s
fi
;;
esac
esac
--
2.25.1

17
meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch → meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
View File

@ -1,21 +1,23 @@
From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001
From 09a67d3945f1fde8372532ef2e19af20db2112cd Mon Sep 17 00:00:00 2001
From: Marek Vasut <marex@denx.de>
Date: Sat, 30 Jan 2016 07:18:02 +0100
Subject: [PATCH] Add nios2 support
Add support for the nios2 CPU.
Signed-off-by: Marek Vasut <marex@denx.de>
Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
Signed-off-by: Marek Vasut <marex@denx.de>
---
pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++
pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++
pr/include/md/_linux.h | 4 +++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index 009d5e5..77c13df 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -975,6 +975,51 @@
@@ -979,6 +979,51 @@
#define PR_BYTES_PER_WORD_LOG2 2
#define PR_BYTES_PER_DWORD_LOG2 3
@ -67,6 +69,8 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
#elif defined(__or1k__)
#undef IS_LITTLE_ENDIAN
diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
index ad57d08..45a2231 100644
--- a/pr/include/md/_linux.h
+++ b/pr/include/md/_linux.h
@@ -55,6 +55,8 @@
@ -78,7 +82,7 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
#elif defined(__or1k__)
#define _PR_SI_ARCHITECTURE "or1k"
#elif defined(__riscv) && (__riscv_xlen == 32)
@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn
@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
#define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
#endif
@ -87,3 +91,6 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
#if defined(__GNUC__)
/* Use GCC built-in functions */
#define _PR_HAVE_ATOMIC_OPS
--
2.25.1

11
meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch → meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
View File

@ -1,4 +1,4 @@
From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001
From e8cab35851949cd4b7498d56978c5e7907841f32 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 18 Sep 2017 17:22:43 -0700
Subject: [PATCH] md: Fix build with musl
@ -7,17 +7,17 @@ The MIPS specific header <sgidefs.h> is not provided by musl
linux kernel headers provide <asm/sgidefs.h> which has same definitions
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
pr/include/md/_linux.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
index aa3af78..899826f 100644
index 77c13df..3eb2faf 100644
--- a/pr/include/md/_linux.cfg
+++ b/pr/include/md/_linux.cfg
@@ -511,7 +511,7 @@
@@ -515,7 +515,7 @@
#error "Unknown MIPS endianness."
#endif
@ -26,3 +26,6 @@ index aa3af78..899826f 100644
#define IS_64
--
2.25.1

20
meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch → meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
View File

@ -1,4 +1,4 @@
From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001
From 161c955f32dd350413de076b7cad588fa4bdc4de Mon Sep 17 00:00:00 2001
From: Mingli Yu <Mingli.Yu@windriver.com>
Date: Fri, 16 Nov 2018 13:52:49 +0800
Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
4 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
index e737791..b578476 100644
index fa8c783..74b4bdd 100644
--- a/lib/ds/Makefile.in
+++ b/lib/ds/Makefile.in
@@ -114,13 +114,7 @@ GARBAGE += $(TINC)
@@ -104,13 +104,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
@ -42,10 +42,10 @@ index e737791..b578476 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
index e8a6d9f..978ed28 100644
index 9ef2007..21abd6f 100644
--- a/lib/libc/src/Makefile.in
+++ b/lib/libc/src/Makefile.in
@@ -116,13 +116,7 @@ GARBAGE += $(TINC)
@@ -106,13 +106,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
@ -61,10 +61,10 @@ index e8a6d9f..978ed28 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
index aeb2944..f318097 100644
index 5865ab8..a00d20c 100644
--- a/lib/prstreams/Makefile.in
+++ b/lib/prstreams/Makefile.in
@@ -116,13 +116,7 @@ endif
@@ -102,13 +102,7 @@ endif
$(TINC):
@$(MAKE_OBJDIR)
@ -80,10 +80,10 @@ index aeb2944..f318097 100644
$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 19c5a69..b4ac31c 100644
index a9e86f5..bbcbb67 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -326,13 +326,7 @@ GARBAGE += $(TINC)
@@ -291,13 +291,7 @@ GARBAGE += $(TINC)
$(TINC):
@$(MAKE_OBJDIR)
@ -99,5 +99,5 @@ index 19c5a69..b4ac31c 100644
$(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
--
2.7.4
2.25.1

2
meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch → meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
View File

@ -1,4 +1,4 @@
From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001
From 88bf2abc07ae56ed1bcc9e915add0b3d9ed66c7b Mon Sep 17 00:00:00 2001
From: Mingli Yu <mingli.yu@windriver.com>
Date: Wed, 10 Aug 2022 15:21:07 +0800
Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS

15
meta-oe/recipes-support/nspr/nspr_4.35.bb → meta-oe/recipes-support/nspr/nspr_4.36.bb
View File

@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d
SECTION = "libs/network"
SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
file://remove-rpath-from-tests.patch \
file://fix-build-on-x86_64.patch \
file://0002-Add-nios2-support.patch \
file://0001-md-Fix-build-with-musl.patch \
file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
file://0001-Fix-Wincompatible-function-pointer-types.patch \
file://0001-remove-rpath-from-tests.patch \
file://0002-Fix-build-failure-on-x86_64.patch \
file://0003-Add-nios2-support.patch \
file://0004-md-Fix-build-with-musl.patch \
file://0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
file://0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
file://nspr.pc.in \
"
@ -24,7 +23,7 @@ CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f"
SRC_URI[sha256sum] = "55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895"
CVE_PRODUCT = "netscape_portable_runtime"