diff --git a/recipes/apr/all/conandata.yml b/recipes/apr/all/conandata.yml index 99413b626b3c6..0e388265ecf5f 100644 --- a/recipes/apr/all/conandata.yml +++ b/recipes/apr/all/conandata.yml @@ -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" - 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" diff --git a/recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch b/recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch new file mode 100644 index 0000000000000..ea5a43d70f982 --- /dev/null +++ b/recipes/apr/all/patches/0401-cmake-build-only-shared-static.patch @@ -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) + diff --git a/recipes/apr/config.yml b/recipes/apr/config.yml index 0f57b11de8fb0..87d6549199fa1 100644 --- a/recipes/apr/config.yml +++ b/recipes/apr/config.yml @@ -1,3 +1,5 @@ versions: + "1.7.4": + folder: all "1.7.0": folder: all