Skip to contentSkip to conversation

package/zlib: zlib-ng only available on some archs

PATCH New Yann E. MORIN 2 participants 2 messages Feb 25, 2018 – Feb 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/zlib: zlib-ng only available on some archs

Upstream has code only for those architectures, with no fallback generic code, so we must restrict zlib-ng to only those four archs...

Cc Nicolas Cavallari <[email protected]>
Cc Adam Duskett <[email protected]>
Cc Stefan Fr?berg <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Note: I was not sure if the big-endian variants for arm and Aarch64 are supported or not, so to be safe, we supopse they are not. Interested parties can send further patches to improve the situation.

---
 package/zlib/Config.in | 8 ++++++++
 1 file changed, 8 insertions(+)
package/zlib/Config.in +8 -0
index 87abc2bdd5..40b2e6e0cf 100644
@@ -1,3 +1,10 @@
+config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPOPRT
+	bool
+	default y if BR2_arm
+	default y if BR2_aarch64
+	default y if BR2_i386
+	default y if BR2_x86_64
+
 config BR2_PACKAGE_ZLIB
 	bool "zlib support"
 	help
@@ -22,6 +29,7 @@ config BR2_PACKAGE_LIBZLIB
 
 config BR2_PACKAGE_ZLIB_NG
 	bool "zlib-ng"
+	depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPOPRT
 	select BR2_PACKAGE_HAS_ZLIB
 	help
 	  Zlib replacement with optimizations for
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/zlib: zlib-ng only available on some archs

Hello,

Quoted 22 lines · Yann E. MORIN

Upstream has code only for those architectures, with no fallback generic code, so we must restrict zlib-ng to only those four archs...

Cc Nicolas Cavallari <[email protected]>
Cc Adam Duskett <[email protected]>
Cc Stefan Fr?berg <[email protected]>
Cc Thomas Petazzoni <[email protected]>

---
Note: I was not sure if the big-endian variants for arm and Aarch64 are supported or not, so to be safe, we supopse they are not. Interested parties can send further patches to improve the situation.

---
 package/zlib/Config.in | 8 ++++++++
 1 file changed, 8 insertions(+)
package/zlib/Config.in +0 -0
index 87abc2bdd5..40b2e6e0cf 100644

package/zlib/Config.in line 1

Quoted 1 line
package/zlib/Config.in +1 -0
@@ -1,3 +1,10 @@
+config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPOPRT

Typo: SUPPORTS

package/zlib/Config.in config BR2_PACKAGE_LIBZLIB · line 32

Quoted 3 lines
package/zlib/Config.in +1 -0
 config BR2_PACKAGE_ZLIB_NG
 	bool "zlib-ng"
+	depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPOPRT

The typo was consistent :-)

Applied to master with the typo fixed. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com