All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/libnspr: bump to version 4.35
@ 2022-09-13 20:59 Giulio Benetti
  2022-09-17  8:27 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Giulio Benetti @ 2022-09-13 20:59 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti

Let's drop local patch that has been upstreamed.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 ...-1765100-fix-build-on-mips-musl-libc.patch | 33 -------------------
 package/libnspr/libnspr.hash                  |  4 +--
 package/libnspr/libnspr.mk                    |  2 +-
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 package/libnspr/0001-Bug-1765100-fix-build-on-mips-musl-libc.patch

diff --git a/package/libnspr/0001-Bug-1765100-fix-build-on-mips-musl-libc.patch b/package/libnspr/0001-Bug-1765100-fix-build-on-mips-musl-libc.patch
deleted file mode 100644
index 10bf74130c..0000000000
--- a/package/libnspr/0001-Bug-1765100-fix-build-on-mips-musl-libc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 00e5b818f2d9f3264107801fc2fcff33a9355a78 Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@benettiengineering.com>
-Date: Sun, 17 Apr 2022 23:55:26 +0200
-Subject: [PATCH] Bug 1765100 - fix build on mips+musl libc
-
-This patch fix build failure on mips with musl libc by using Linux
-<asm/sgidefs.h> instead of the one provided by libc since musl doesn't
-provide <sgidefs.h>.
-
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
-This patch is pending upstream:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1765100
----
- nspr/pr/include/md/_linux.cfg | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nspr/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
-index 23b160fd..dbc0d40e 100644
---- a/nspr/pr/include/md/_linux.cfg
-+++ b/nspr/pr/include/md/_linux.cfg
-@@ -499,7 +499,7 @@
- #elif defined(__mips__)
- 
- /* For _ABI64 */
--#include <sgidefs.h>
-+#include <asm/sgidefs.h>
- 
- #ifdef __MIPSEB__
- #define IS_BIG_ENDIAN 1
--- 
-2.25.1
-
diff --git a/package/libnspr/libnspr.hash b/package/libnspr/libnspr.hash
index a368f02c54..c569135663 100644
--- a/package/libnspr/libnspr.hash
+++ b/package/libnspr/libnspr.hash
@@ -1,4 +1,4 @@
-# From https://ftp.mozilla.org/pub/nspr/releases/v4.34.1/src/SHA256SUMS
-sha256  c5b8354c48b632b8f4c1970628146c0e0c0ca8f32c7315d7d5736c002e03774f  nspr-4.34.1.tar.gz
+# From https://ftp.mozilla.org/pub/nspr/releases/v4.35/src/SHA256SUMS
+sha256  7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f  nspr-4.35.tar.gz
 # Locally calculated
 sha256  fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85  nspr/LICENSE
diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index fcb2a1db49..e891aa4852 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBNSPR_VERSION = 4.34.1
+LIBNSPR_VERSION = 4.35
 LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
 LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src
 LIBNSPR_SUBDIR = nspr
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Buildroot] [PATCH] package/libnspr: bump to version 4.35
  2022-09-13 20:59 [Buildroot] [PATCH] package/libnspr: bump to version 4.35 Giulio Benetti
@ 2022-09-17  8:27 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2022-09-17  8:27 UTC (permalink / raw)
  To: Giulio Benetti; +Cc: buildroot

On Tue, 13 Sep 2022 22:59:05 +0200
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> Let's drop local patch that has been upstreamed.
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>  ...-1765100-fix-build-on-mips-musl-libc.patch | 33 -------------------
>  package/libnspr/libnspr.hash                  |  4 +--
>  package/libnspr/libnspr.mk                    |  2 +-
>  3 files changed, 3 insertions(+), 36 deletions(-)
>  delete mode 100644 package/libnspr/0001-Bug-1765100-fix-build-on-mips-musl-libc.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-17  8:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-13 20:59 [Buildroot] [PATCH] package/libnspr: bump to version 4.35 Giulio Benetti
2022-09-17  8:27 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.