Skip to content

[APR] Upgrade to 1.7.4 #17323

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.

Sign up for GitHub

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

Merged
conan-center-bot merged 5 commits into from
May 17, 2023
Merged

[APR] Upgrade to 1.7.4 #17323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a26e7a2
Add version 1.7.4
stephen-webb Apr 30, 2023
447f0a8
Merge branch 'master' of https://github.com/conan-io/conan-center-ind…
stephen-webb Apr 30, 2023
fd0425d
Replace deprecated sys_siglist[] with strsignal()
stephen-webb Apr 30, 2023
8de58b9
Add 1.7.4 to built version list
stephen-webb May 1, 2023
a2c1a5d
Merge branch 'master' into upgrade_apr
AbrilRBS May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions recipes/apr/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
sources:
"1.7.4":
url: "https://archive.apache.org/dist/apr/apr-1.7.4.tar.bz2"
sha256: "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577"
"1.7.0":
url: "https://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2"
sha256: "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea"
patches:
"1.7.4":
- patch_file: "patches/0401-cmake-build-only-shared-static.patch"
patch_type: "conan"
patch_description: "Use BUILD_SHARED_LIBS to conditionally build static/dynamic libs"
- patch_file: "patches/0006-sys_siglist-fix.patch"
patch_type: "bugfix"
patch_description: "Replace deprecated sys_siglist[] with strsignal()"
"1.7.0":
- patch_file: "patches/0001-cmake-build-only-shared-static.patch"
patch_type: "conan"
patch_description: "Use BUILD_SHARED_LIBS to conditionally build static/dynamic libs"
- patch_file: "patches/0002-apr-config-prefix-env.patch"
- patch_file: "patches/0003-cmake-gen_test_char-use-target.patch"
- patch_file: "patches/0004-autotools-mingw.patch"
Comment on lines 20 to 22

@SpaceIm SpaceIm Sep 18, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These patches have not been ported to 1.7.4, why? I suspect that 0002-apr-config-prefix-env.patch is still necessary to avoid #19936 and supports build of apr-util in the context of relocatable packages.

@SpaceIm SpaceIm Sep 18, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I've opened #19940

- patch_file: "patches/0005-clang12-apple.patch"
- patch_file: "patches/0006-sys_siglist-fix.patch"
patch_type: "bugfix"
patch_description: "Replace deprecated sys_siglist[] with strsignal()"
- patch_file: "patches/0007-cmake-minimum-required.patch"
33 changes: 33 additions & 0 deletions recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -261,26 +261,25 @@ SET(install_targets)
SET(install_bin_pdb)

# libapr-1 is shared, apr-1 is static
+IF(BUILD_SHARED_LIBS)
ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
SET(install_targets ${install_targets} libapr-1)
SET(install_bin_pdb ${install_bin_pdb} ${PROJECT_BINARY_DIR}/libapr-1.pdb)
TARGET_LINK_LIBRARIES(libapr-1 ${APR_SYSTEM_LIBS})
SET_TARGET_PROPERTIES(libapr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_EXPORT;WINNT")
ADD_DEPENDENCIES(libapr-1 test_char_header)
-
+ELSE()
ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
SET(install_targets ${install_targets} apr-1)
TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
ADD_DEPENDENCIES(apr-1 test_char_header)
-
+ENDIF()
# libaprapp-1 and aprapp-1 are static
ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} libaprapp-1)
SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")

ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
-SET(install_targets ${install_targets} aprapp-1)
SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")

IF(APR_BUILD_TESTAPR)

2 changes: 2 additions & 0 deletions recipes/apr/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.7.4":
folder: all
"1.7.0":
folder: all