* [Buildroot] [PATCH 1/3] package/libnspr: allow building for Arc Architecture
2019-12-27 14:43 [Buildroot] [PATCH 0/3] NSPR cleanup Giulio Benetti
@ 2019-12-27 14:43 ` Giulio Benetti
2019-12-27 14:43 ` [Buildroot] [PATCH 2/3] package/libnspr: enable building with xtensa Giulio Benetti
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Giulio Benetti @ 2019-12-27 14:43 UTC (permalink / raw)
To: buildroot
Arc architecture is now supported by NSPR so let's allow to build for
it.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
package/libnspr/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index 1d95155248..57fcbdf6be 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
def_bool y
- depends on !BR2_arc && !BR2_xtensa
+ depends on !BR2_xtensa
if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/3] package/libnspr: enable building with xtensa
2019-12-27 14:43 [Buildroot] [PATCH 0/3] NSPR cleanup Giulio Benetti
2019-12-27 14:43 ` [Buildroot] [PATCH 1/3] package/libnspr: allow building for Arc Architecture Giulio Benetti
@ 2019-12-27 14:43 ` Giulio Benetti
2019-12-27 14:43 ` [Buildroot] [PATCH 3/3] package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT Giulio Benetti
2019-12-29 9:57 ` [Buildroot] [PATCH 0/3] NSPR cleanup Yann E. MORIN
3 siblings, 0 replies; 7+ messages in thread
From: Giulio Benetti @ 2019-12-27 14:43 UTC (permalink / raw)
To: buildroot
Add patch to support Xtensa architecture building.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
Patch pending upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=1606092
---
...6092_Add_support_for_building_xtensa.patch | 33 +++++++++++++++++++
package/libnspr/Config.in | 1 -
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
diff --git a/package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch b/package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
new file mode 100644
index 0000000000..73a70277b6
--- /dev/null
+++ b/package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Giulio Benetti <giuliobenetti@micronovasrl.com>
+# Date 1577456724 -3600
+# Fri Dec 27 15:25:24 2019 +0100
+# Node ID 1a3d96917971ea13432116f41ace8a9e19ef7f97
+# Parent b9c2a7602ab0a1c0c890db6cf4c3b1f1e6e243c1
+Bug 1606092 - Add support for building Xtensa
+
+diff -r b9c2a7602ab0 -r 1a3d96917971 nspr/pr/include/md/_linux.cfg
+--- a/nspr/pr/include/md/_linux.cfg Mon Dec 02 19:24:25 2019 +0100
++++ b/nspr/pr/include/md/_linux.cfg Fri Dec 27 15:25:24 2019 +0100
+@@ -1157,7 +1157,8 @@
+ #define PR_BYTES_PER_WORD_LOG2 2
+ #define PR_BYTES_PER_DWORD_LOG2 3
+
+-#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__)
++#elif defined(__nios2__) || defined(__microblaze__) || defined(__nds32__) || \
++ defined(__xtensa__)
+
+ #if defined(__microblaze__) && defined(__BIG_ENDIAN__)
+ #define IS_BIG_ENDIAN 1
+diff -r b9c2a7602ab0 -r 1a3d96917971 nspr/pr/include/md/_linux.h
+--- a/nspr/pr/include/md/_linux.h Mon Dec 02 19:24:25 2019 +0100
++++ b/nspr/pr/include/md/_linux.h Fri Dec 27 15:25:24 2019 +0100
+@@ -69,6 +69,8 @@
+ #define _PR_SI_ARCHITECTURE "microblaze"
+ #elif defined(__nds32__)
+ #define _PR_SI_ARCHITECTURE "nds32"
++#elif defined(__xtensa__)
++#define _PR_SI_ARCHITECTURE "xtensa"
+ #else
+ #error "Unknown CPU architecture"
+ #endif
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index 57fcbdf6be..c1be7151e0 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
def_bool y
- depends on !BR2_xtensa
if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/3] package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
2019-12-27 14:43 [Buildroot] [PATCH 0/3] NSPR cleanup Giulio Benetti
2019-12-27 14:43 ` [Buildroot] [PATCH 1/3] package/libnspr: allow building for Arc Architecture Giulio Benetti
2019-12-27 14:43 ` [Buildroot] [PATCH 2/3] package/libnspr: enable building with xtensa Giulio Benetti
@ 2019-12-27 14:43 ` Giulio Benetti
2019-12-29 9:57 ` [Buildroot] [PATCH 0/3] NSPR cleanup Yann E. MORIN
3 siblings, 0 replies; 7+ messages in thread
From: Giulio Benetti @ 2019-12-27 14:43 UTC (permalink / raw)
To: buildroot
Since all architectures supported by Buildroot are supported by libnspr
BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT makes no sense anymore, so let's remove
it all around.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
package/ecryptfs-utils/Config.in | 2 --
package/libnspr/Config.in | 7 -------
package/libnss/Config.in | 2 --
package/spidermonkey/Config.in | 1 -
4 files changed, 12 deletions(-)
diff --git a/package/ecryptfs-utils/Config.in b/package/ecryptfs-utils/Config.in
index 0c39f48d08..08210f05eb 100644
--- a/package/ecryptfs-utils/Config.in
+++ b/package/ecryptfs-utils/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
depends on BR2_USE_WCHAR # gettext
depends on BR2_USE_MMU # keyutils
depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr
- depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
depends on !BR2_MIPS_NABI32 # libnss
depends on !BR2_STATIC_LIBS # libnss, keyutils
select BR2_PACKAGE_KEYUTILS
@@ -29,7 +28,6 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
http://ecryptfs.org
comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library"
- depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
BR2_STATIC_LIBS
diff --git a/package/libnspr/Config.in b/package/libnspr/Config.in
index c1be7151e0..de8dd0a06b 100644
--- a/package/libnspr/Config.in
+++ b/package/libnspr/Config.in
@@ -1,8 +1,3 @@
-config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
- def_bool y
-
-if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
-
config BR2_PACKAGE_LIBNSPR
bool "libnspr"
depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -17,5 +12,3 @@ config BR2_PACKAGE_LIBNSPR
comment "libnspr needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-endif
diff --git a/package/libnss/Config.in b/package/libnss/Config.in
index 599c9a6536..90bf75f476 100644
--- a/package/libnss/Config.in
+++ b/package/libnss/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_LIBNSS
bool "libnss"
depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
- depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
depends on !BR2_STATIC_LIBS
select BR2_PACKAGE_LIBNSPR
select BR2_PACKAGE_SQLITE
@@ -16,5 +15,4 @@ config BR2_PACKAGE_LIBNSS
http://www.mozilla.org/projects/security/pki/nss/
comment "libnss needs a toolchain w/ threads, dynamic library"
- depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/package/spidermonkey/Config.in b/package/spidermonkey/Config.in
index 5f12110626..150b941c94 100644
--- a/package/spidermonkey/Config.in
+++ b/package/spidermonkey/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_SPIDERMONKEY_ARCH_SUPPORTS
default y if BR2_riscv
default y if BR2_sh4 || BR2_sh4a
default y if BR2_sparc || BR2_sparc64
- depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
config BR2_PACKAGE_SPIDERMONKEY_JIT_ARCH_SUPPORTS
bool
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 0/3] NSPR cleanup
2019-12-27 14:43 [Buildroot] [PATCH 0/3] NSPR cleanup Giulio Benetti
` (2 preceding siblings ...)
2019-12-27 14:43 ` [Buildroot] [PATCH 3/3] package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT Giulio Benetti
@ 2019-12-29 9:57 ` Yann E. MORIN
2019-12-29 23:33 ` Giulio Benetti
2020-01-16 14:58 ` Giulio Benetti
3 siblings, 2 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-29 9:57 UTC (permalink / raw)
To: buildroot
Giulio, All,
On 2019-12-27 15:43 +0100, Giulio Benetti spake thusly:
> This patchset makes libnspr available for every architecture, before
> Xtensa and Arc architectures were not supported. By doing this we can then
> remove additional check in Config.in files with
> 'depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT' that becomes useless.
>
> Giulio Benetti (3):
> package/libnspr: allow building for Arc Architecture
I've applied that one...
> package/libnspr: enable building with xtensa
> package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
.. but those two ones are a feature patch. Let's at least wait for
upstream to reply/apply it before we can carry it. As such, I've marked
them as "Awaiting Upstream" (which is basically equivalanet to a reject,
sorry).
Regards,
Yann E. MORIN.
>
> package/ecryptfs-utils/Config.in | 2 --
> ...6092_Add_support_for_building_xtensa.patch | 33 +++++++++++++++++++
> package/libnspr/Config.in | 8 -----
> package/libnss/Config.in | 2 --
> package/spidermonkey/Config.in | 1 -
> 5 files changed, 33 insertions(+), 13 deletions(-)
> create mode 100644 package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
>
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 0/3] NSPR cleanup
2019-12-29 9:57 ` [Buildroot] [PATCH 0/3] NSPR cleanup Yann E. MORIN
@ 2019-12-29 23:33 ` Giulio Benetti
2020-01-16 14:58 ` Giulio Benetti
1 sibling, 0 replies; 7+ messages in thread
From: Giulio Benetti @ 2019-12-29 23:33 UTC (permalink / raw)
To: buildroot
Hi Yann, All,
On 12/29/19 10:57 AM, Yann E. MORIN wrote:
> Giulio, All,
>
> On 2019-12-27 15:43 +0100, Giulio Benetti spake thusly:
>> This patchset makes libnspr available for every architecture, before
>> Xtensa and Arc architectures were not supported. By doing this we can then
>> remove additional check in Config.in files with
>> 'depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT' that becomes useless.
>>
>> Giulio Benetti (3):
>> package/libnspr: allow building for Arc Architecture
>
> I've applied that one...
>
>> package/libnspr: enable building with xtensa
>> package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
>
> .. but those two ones are a feature patch. Let's at least wait for
> upstream to reply/apply it before we can carry it. As such, I've marked
> them as "Awaiting Upstream" (which is basically equivalanet to a reject,
> sorry).
Patch: "package/libnspr: enable building with xtensa" contains a patch
that is equal to previous patch I've already upstream to support
microblaze, nios-II and nds32. So Xtensa should do nothing different
from those 3 architectures and endianness is taken into account too.
So if upstream already trusted it:
https://bugzilla.mozilla.org/show_bug.cgi?id=1578363
they should trust the same this new one.
Thanks for reviewing and
Kind regards
--
Giulio Benetti
Benetti Engineering sas
> Regards,
> Yann E. MORIN.
>
>>
>> package/ecryptfs-utils/Config.in | 2 --
>> ...6092_Add_support_for_building_xtensa.patch | 33 +++++++++++++++++++
>> package/libnspr/Config.in | 8 -----
>> package/libnss/Config.in | 2 --
>> package/spidermonkey/Config.in | 1 -
>> 5 files changed, 33 insertions(+), 13 deletions(-)
>> create mode 100644 package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
>>
>> --
>> 2.20.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 0/3] NSPR cleanup
2019-12-29 9:57 ` [Buildroot] [PATCH 0/3] NSPR cleanup Yann E. MORIN
2019-12-29 23:33 ` Giulio Benetti
@ 2020-01-16 14:58 ` Giulio Benetti
1 sibling, 0 replies; 7+ messages in thread
From: Giulio Benetti @ 2020-01-16 14:58 UTC (permalink / raw)
To: buildroot
Hi Yann,
On 12/29/19 10:57 AM, Yann E. MORIN wrote:
> Giulio, All,
>
> On 2019-12-27 15:43 +0100, Giulio Benetti spake thusly:
>> This patchset makes libnspr available for every architecture, before
>> Xtensa and Arc architectures were not supported. By doing this we can then
>> remove additional check in Config.in files with
>> 'depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT' that becomes useless.
>>
>> Giulio Benetti (3):
>> package/libnspr: allow building for Arc Architecture
>
> I've applied that one...
>
>> package/libnspr: enable building with xtensa
>> package/libnspr: remove BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
>
> .. but those two ones are a feature patch. Let's at least wait for
> upstream to reply/apply it before we can carry it. As such, I've marked
> them as "Awaiting Upstream" (which is basically equivalanet to a reject,
> sorry).
Patch contained in "package/libnspr: enable building with xtensa" has
been upstreamed:
https://bugzilla.mozilla.org/show_bug.cgi?id=1606092
https://hg.mozilla.org/projects/nspr/rev/ef5d8d008815e8367e684149f88b43f5ae53e1d7
Best regards
--
Giulio Benetti
Benetti Engineering sas
> Regards,
> Yann E. MORIN.
>
>>
>> package/ecryptfs-utils/Config.in | 2 --
>> ...6092_Add_support_for_building_xtensa.patch | 33 +++++++++++++++++++
>> package/libnspr/Config.in | 8 -----
>> package/libnss/Config.in | 2 --
>> package/spidermonkey/Config.in | 1 -
>> 5 files changed, 33 insertions(+), 13 deletions(-)
>> create mode 100644 package/libnspr/0001-Bug_1606092_Add_support_for_building_xtensa.patch
>>
>> --
>> 2.20.1
>>
>> _______________________________________________
>> buildroot mailing list
>> buildroot at busybox.net
>> http://lists.busybox.net/mailman/listinfo/buildroot
>
--
Giulio Benetti
Benetti Engineering sas
^ permalink raw reply [flat|nested] 7+ messages in thread