Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMakeLists.txt: fix version in zlib.pc when building statically #1278

Merged
merged 1 commit into from
Jun 2, 2022
Merged

CMakeLists.txt: fix version in zlib.pc when building statically #1278

merged 1 commit into from
Jun 2, 2022

Conversation

ffontaine
Copy link
Contributor

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:

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

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>
@codecov
Copy link

codecov bot commented May 30, 2022

Codecov Report

Merging #1278 (9fcc446) into develop (8568840) will decrease coverage by 0.04%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #1278      +/-   ##
===========================================
- Coverage    86.76%   86.71%   -0.05%     
===========================================
  Files          123      123              
  Lines        10578    10578              
  Branches      2646     2646              
===========================================
- Hits          9178     9173       -5     
- Misses        1052     1055       +3     
- Partials       348      350       +2     
Flag Coverage Δ
macos_clang 33.33% <ø> (ø)
macos_gcc 74.15% <ø> (ø)
ubuntu_clang 85.74% <ø> (-0.14%) ⬇️
ubuntu_clang_debug 85.35% <ø> (-0.14%) ⬇️
ubuntu_clang_inflate_allow_invalid_dist 85.46% <ø> (-0.14%) ⬇️
ubuntu_clang_inflate_strict 85.70% <ø> (-0.14%) ⬇️
ubuntu_clang_mmap 85.88% <ø> (-0.14%) ⬇️
ubuntu_clang_pigz 39.82% <ø> (ø)
ubuntu_clang_pigz_no_optim 41.68% <ø> (ø)
ubuntu_clang_pigz_no_threads 39.42% <ø> (ø)
ubuntu_clang_reduced_mem 86.13% <ø> (ø)
ubuntu_gcc 75.96% <ø> (ø)
ubuntu_gcc_aarch64 77.65% <ø> (ø)
ubuntu_gcc_aarch64_compat_no_opt 75.67% <ø> (ø)
ubuntu_gcc_aarch64_no_acle 76.49% <ø> (ø)
ubuntu_gcc_aarch64_no_neon 76.40% <ø> (ø)
ubuntu_gcc_armhf 77.66% <ø> (ø)
ubuntu_gcc_armhf_compat_no_opt 75.65% <ø> (ø)
ubuntu_gcc_armhf_no_acle 77.67% <ø> (ø)
ubuntu_gcc_armhf_no_neon 77.46% <ø> (ø)
ubuntu_gcc_armsf 77.57% <ø> (ø)
ubuntu_gcc_armsf_compat_no_opt 75.32% <ø> (ø)
ubuntu_gcc_benchmark 74.27% <ø> (-0.19%) ⬇️
ubuntu_gcc_compat_no_opt 76.86% <ø> (ø)
ubuntu_gcc_compat_sprefix 74.25% <ø> (ø)
ubuntu_gcc_m32 74.16% <ø> (+0.14%) ⬆️
ubuntu_gcc_mingw_i686 0.00% <ø> (ø)
ubuntu_gcc_mingw_x86_64 0.00% <ø> (ø)
ubuntu_gcc_no_avx2 75.15% <ø> (ø)
ubuntu_gcc_no_ctz 75.04% <ø> (ø)
ubuntu_gcc_no_ctzll 75.07% <ø> (ø)
ubuntu_gcc_no_pclmulqdq 74.24% <ø> (+0.05%) ⬆️
ubuntu_gcc_no_sse2 75.35% <ø> (ø)
ubuntu_gcc_no_sse4 75.00% <ø> (-0.05%) ⬇️
ubuntu_gcc_o1 74.73% <ø> (+0.04%) ⬆️
ubuntu_gcc_osb ∅ <ø> (∅)
ubuntu_gcc_pigz 37.85% <ø> (-0.06%) ⬇️
ubuntu_gcc_pigz_aarch64 39.33% <ø> (ø)
ubuntu_gcc_ppc 73.84% <ø> (ø)
ubuntu_gcc_ppc64 74.60% <ø> (ø)
ubuntu_gcc_ppc64le 74.58% <ø> (ø)
ubuntu_gcc_ppc_no_power8 74.79% <ø> (ø)
ubuntu_gcc_s390x 75.00% <ø> (ø)
ubuntu_gcc_s390x_dfltcc 72.38% <ø> (ø)
ubuntu_gcc_s390x_dfltcc_compat 73.79% <ø> (ø)
ubuntu_gcc_s390x_no_crc32 74.79% <ø> (ø)
ubuntu_gcc_sparc64 74.90% <ø> (ø)
ubuntu_gcc_sprefix 74.20% <ø> (+0.14%) ⬆️
win64_gcc 74.22% <ø> (ø)
win64_gcc_compat_no_opt 74.38% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
arch/x86/adler32_avx512_tpl.h 91.48% <0.00%> (-8.52%) ⬇️
arch/x86/adler32_avx512_p.h 95.23% <0.00%> (-4.77%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8568840...9fcc446. Read the comment docs.

Copy link
Member

@Dead2 Dead2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Dead2 Dead2 merged commit 6038b64 into zlib-ng:develop Jun 2, 2022
@Dead2 Dead2 mentioned this pull request Dec 27, 2022
Dead2 added a commit that referenced this pull request Mar 7, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Dead2 added a commit that referenced this pull request Mar 17, 2023
Changes since 2.0.6:
- Fix CVE-2022-37434 #1328
- Fix chunkmemset #1196
- Fix deflateBound too small #1236
- Fix Z_SOLO #1263
- Fix ACLE variant of crc32 #1274
- Fix inflateBack #1311
- Fix deflate_quick windowsize #1431
- Fix DFLTCC bugs related to adler32 #1349 and #1390
- Fix warnings #1194 #1312 #1362
- MacOS build fix #1198
- Add invalid windowBits handling #1293
- Support for Force TZCNT #1186
- Support for aligned_alloc() #1360
- Minideflate improvements #1175 #1238
- Dont use unaligned access for memcpy #1309
- Build system #1209 #1233 #1267 #1273 #1278 #1292 #1316 #1318 #1365
- Test improvements #1208 #1227 #1241 #1353
- Cleanup #1266
- Documentation #1205 #1359
- Misc improvements #1294 #1297 #1306 #1344 #1348
- Backported zlib fixes
- Backported CI workflows from Develop branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants