[Buildroot] [PATCH v2, 1/4] package/zlib: add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB

[Buildroot] [PATCH v2, 1/4] package/zlib: add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB

[Fabrice Fontaine]

Add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/zlib/Config.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/zlib/Config.in b/package/zlib/Config.in
index d6d94889a7..3a486376ac 100644
--- a/package/zlib/Config.in
+++ b/package/zlib/Config.in
@@ -1,3 +1,6 @@
+config BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
+	bool
+
 config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
 	bool
 	default y if BR2_arm
@@ -33,6 +36,7 @@ config BR2_PACKAGE_LIBZLIB
 config BR2_PACKAGE_ZLIB_NG
 	bool "zlib-ng"
 	depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 	select BR2_PACKAGE_HAS_ZLIB
 	help
 	  Zlib replacement with optimizations for
-- 
2.35.1

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

[Buildroot] [PATCH v2, 2/4] package/clamav: doesn't build with zlib-ng

[Fabrice Fontaine]

clamav doesn't build with zlib-ng since bump to version 1.9.9-b1 in
commit 1f7b12a0b4572d7e763c431a63c22cfb912b8b14 and the removal of FAR:
https://github.com/zlib-ng/zlib-ng/commit/0db1040667b13c0f9405af810f669857a487b08e:

In file included from nsis/nsis_zlib.h:32,
                 from nsis/nulsft.c:38:
nsis/nsis_zutil.h:36:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf'
   36 | typedef uch FAR uchf;
      |                 ^~~~

Fixes:
 - http://autobuild.buildroot.org/results/524ee31face8be6a813829b036c4d6134ee5ca98

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
Changes v1 -> v2:
 - Force libzlib instead of depending on it to avoid a recursive
   dependency

 package/clamav/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/clamav/Config.in b/package/clamav/Config.in
index 990a818b5c..2857f9cbf4 100644
--- a/package/clamav/Config.in
+++ b/package/clamav/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_CLAMAV
 	select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 	help
 	  ClamAV is an open source antivirus engine for detecting
 	  trojans, viruses, malware & other malicious threats.
-- 
2.35.1

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

[Buildroot] [PATCH v2,3/4] package/assimp: force libzlib

[Fabrice Fontaine]

Force libzlib instead of depending on it

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/assimp/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/assimp/Config.in b/package/assimp/Config.in
index 833e559a6f..5ffb50cd79 100644
--- a/package/assimp/Config.in
+++ b/package/assimp/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_ASSIMP
 	bool "assimp"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_PACKAGE_LIBZLIB
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 	help
 	  Open Asset Import Library (assimp) is a portable Open Source
 	  library to import various well-known 3D model formats in a
@@ -14,11 +15,7 @@ config BR2_PACKAGE_ASSIMP
 	  http://www.assimp.org
 
 comment "assimp needs a toolchain w/ C++, wchar"
-	depends on BR2_PACKAGE_LIBZLIB
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
 
-comment "assimp needs libzlib"
-	depends on !BR2_PACKAGE_LIBZLIB
-
 comment "assimp needs exception_ptr"
 	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
-- 
2.35.1

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

[Buildroot] [PATCH v2,4/4] package/quazip: force libzlib

[Fabrice Fontaine]

Force libzlib instead of depending on it

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/quazip/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/quazip/Config.in b/package/quazip/Config.in
index a670ed458c..bba5eddf3d 100644
--- a/package/quazip/Config.in
+++ b/package/quazip/Config.in
@@ -1,13 +1,11 @@
 config BR2_PACKAGE_QUAZIP
 	bool "quazip"
-	depends on BR2_PACKAGE_LIBZLIB
 	depends on BR2_PACKAGE_QT5
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 	help
 	  QuaZIP is a simple C++ wrapper over Gilles Vollant's
 	  ZIP/UNZIP package that can be used to access ZIP
 	  archives. It uses the Qt toolkit.
 
 	  http://quazip.sourceforge.net
-
-comment "quazip needs libzlib"
-	depends on !BR2_PACKAGE_LIBZLIB
-- 
2.35.1

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

Re: [Buildroot] [PATCH v2, 1/4] package/zlib: add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB

[Yann E. MORIN]

Fabrice, All,

On 2022-04-23 22:39 +0200, Fabrice Fontaine spake thusly:
> Add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Series of 4 patches applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/zlib/Config.in | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/package/zlib/Config.in b/package/zlib/Config.in
> index d6d94889a7..3a486376ac 100644
> --- a/package/zlib/Config.in
> +++ b/package/zlib/Config.in
> @@ -1,3 +1,6 @@
> +config BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
> +	bool
> +
>  config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
>  	bool
>  	default y if BR2_arm
> @@ -33,6 +36,7 @@ config BR2_PACKAGE_LIBZLIB
>  config BR2_PACKAGE_ZLIB_NG
>  	bool "zlib-ng"
>  	depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
> +	depends on !BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
>  	select BR2_PACKAGE_HAS_ZLIB
>  	help
>  	  Zlib replacement with optimizations for
> -- 
> 2.35.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 1/4] package/zlib: add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Add BR2_PACKAGE_ZLIB_FORCE_LIBZLIB
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2, 2/4] package/clamav: doesn't build with zlib-ng

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > clamav doesn't build with zlib-ng since bump to version 1.9.9-b1 in
 > commit 1f7b12a0b4572d7e763c431a63c22cfb912b8b14 and the removal of FAR:
 > https://github.com/zlib-ng/zlib-ng/commit/0db1040667b13c0f9405af810f669857a487b08e:

 > In file included from nsis/nsis_zlib.h:32,
 >                  from nsis/nulsft.c:38:
 > nsis/nsis_zutil.h:36:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf'
 >    36 | typedef uch FAR uchf;
 >       |                 ^~~~

 > Fixes:
 >  - http://autobuild.buildroot.org/results/524ee31face8be6a813829b036c4d6134ee5ca98

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 > ---
 > Changes v1 -> v2:
 >  - Force libzlib instead of depending on it to avoid a recursive
 >    dependency

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,3/4] package/assimp: force libzlib

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Force libzlib instead of depending on it
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v2,4/4] package/quazip: force libzlib

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Force libzlib instead of depending on it
 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.02.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot