diff mbox series

[1/1] package/zlib-ng: fix version in zlib.pc when building statically

Message ID 20220531191036.107607-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/zlib-ng: fix version in zlib.pc when building statically | expand

Commit Message

Fabrice Fontaine May 31, 2022, 7:10 p.m. UTC 
Fix the following static build failure with transmission:

checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met:

Package dependency requirement 'zlib >= 1.2.3' could not be satisfied.
Package 'zlib' has version '', required version is '>= 1.2.3'

Fixes:
 - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...ix-version-in-zlib.pc-when-building-.patch | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch

Comments

Thomas Petazzoni June 1, 2022, 12:29 p.m. UTC | #1 
On Tue, 31 May 2022 21:10:36 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix the following static build failure with transmission:
> 
> checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met:
> 
> Package dependency requirement 'zlib >= 1.2.3' could not be satisfied.
> Package 'zlib' has version '', required version is '>= 1.2.3'
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...ix-version-in-zlib.pc-when-building-.patch | 53 +++++++++++++++++++
>  1 file changed, 53 insertions(+)
>  create mode 100644 package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch

Applied to master, thanks.

Thomas
Peter Korsgaard June 7, 2022, 12:21 p.m. UTC | #2 
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following static build failure with transmission:
 > checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met:

 > Package dependency requirement 'zlib >= 1.2.3' could not be satisfied.
 > Package 'zlib' has version '', required version is '>= 1.2.3'

 > Fixes:
 >  - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82

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

Committed to 2022.02.x, thanks.
diff mbox series

Patch

diff --git a/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch b/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch
new file mode 100644
index 0000000000..749c45ddca
--- /dev/null
+++ b/package/zlib-ng/0002-CMakeLists.txt-fix-version-in-zlib.pc-when-building-.patch
@@ -0,0 +1,53 @@ 
+From 9fcc446306f27eb253545540ce28403874b899fa Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 27 May 2022 23:25:21 +0200
+Subject: [PATCH] CMakeLists.txt: fix version in zlib.pc when building
+ statically
+
+When building statically (i.e. with BUILD_SHARED_LIBS=OFF),
+ZLIB_FULL_VERSION is not set resulting in an empty version in zlib.pc
+and the following build failure with transmission:
+
+checking for ZLIB... configure: error: Package requirements (zlib >= 1.2.3) were not met:
+
+Package dependency requirement 'zlib >= 1.2.3' could not be satisfied.
+Package 'zlib' has version '', required version is '>= 1.2.3'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/b3b882482f517726e5c780ba4c37818bd379df82
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/zlib-ng/zlib-ng/pull/1278]
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a62a95e..6a26d59 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,8 +150,10 @@ if(ZLIB_COMPAT)
+     add_definitions(-DZLIB_COMPAT)
+     set(WITH_GZFILEOP ON)
+     set(SUFFIX "")
++    set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng)
+ else()
+     set(SUFFIX "-ng")
++    set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION})
+ endif()
+ 
+ if(WITH_GZFILEOP)
+@@ -1068,10 +1070,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
+     set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ 
+     if(ZLIB_COMPAT)
+-        set(ZLIB_FULL_VERSION ${ZLIB_HEADER_VERSION}.zlib-ng)
+         set_target_properties(zlib PROPERTIES SOVERSION 1)
+     else()
+-        set(ZLIB_FULL_VERSION ${ZLIBNG_HEADER_VERSION})
+         set_target_properties(zlib PROPERTIES SOVERSION 2)
+     endif()
+ 
+-- 
+2.35.1
+