From ea520fa5f759b4ebb0408e31e95379540160f902 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:14:14 +0200 Subject: [PATCH 01/22] [apr] use patch and portfile from the stable branch of apr. * Use patch with changes from the stable branch to fix cmake config instead of fix-configcmake.patch file. * Take windows part of the portfile.cmake file from stable branch of apr. * Remove the fix-configcmake.patch file. * Change cmake namespace from `unofficial-apr` to just `apr`, patch is now taken from the stable branch of apr. --- .../apr/apr-r1917051+r1917283+r1917612.patch | 293 ++++++++++++++++++ ports/apr/fix-configcmake.patch | 62 ---- ports/apr/portfile.cmake | 38 ++- 3 files changed, 318 insertions(+), 75 deletions(-) create mode 100644 ports/apr/apr-r1917051+r1917283+r1917612.patch delete mode 100644 ports/apr/fix-configcmake.patch diff --git a/ports/apr/apr-r1917051+r1917283+r1917612.patch b/ports/apr/apr-r1917051+r1917283+r1917612.patch new file mode 100644 index 00000000000000..0b0a9b516e8095 --- /dev/null +++ b/ports/apr/apr-r1917051+r1917283+r1917612.patch @@ -0,0 +1,293 @@ +Index: . +=================================================================== +--- . (revision 1917624) ++++ . (working copy) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,3 ## + Merged /apr/apr/branches/1.7.x:r1917051,1917065,1917283,1917612 + Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 + Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250,1917604 +Index: CHANGES +=================================================================== +--- CHANGES (revision 1917624) ++++ CHANGES (working copy) +@@ -1,4 +1,12 @@ + -*- coding: utf-8 -*- ++ *) CMake: Add support for CMAKE_WARNING_AS_ERROR. [Ivan Zhakov] ++ ++ *) CMake: Enable support for MSVC runtime library selection by abstraction. ++ [Ivan Zhakov] ++ ++ *) CMake: Export installed targets (libapr-1, apr-1, libaprapp-1, aprapp-1) ++ to apr:: namespace. [Ivan Zhakov] ++ + Changes for APR 1.7.4 + + *) Fix a regression where writing to a file opened with both APR_FOPEN_APPEND +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917624) ++++ CMakeLists.txt (working copy) +@@ -21,14 +21,41 @@ + + PROJECT(APR C) + ++# Enable support for MSVC runtime library selection by abstraction ++# if supported by CMake. ++IF(POLICY CMP0091) ++ CMAKE_POLICY(SET CMP0091 NEW) ++ENDIF() ++ ++# Add simple support CMAKE_WARNING_AS_ERROR if CMake doesn't ++# support it. ++IF (CMAKE_VERSION VERSION_LESS 3.24) ++ IF(CMAKE_WARNING_AS_ERROR AND MSVC) ++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") ++ ENDIF() ++ENDIF() ++ ++SET(apr_name apr-1) ++SET(apr_libname libapr-1) ++ + OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) + OPTION(APR_HAVE_IPV6 "IPv6 support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) + OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) ++OPTION(APR_BUILD_SHARED "Build shared libraries" ON) ++OPTION(APR_BUILD_STATIC "Build static libraries." ON) + OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) + SET(MIN_WINDOWS_VER "Vista" + CACHE STRING "Minimum Windows version") + ++IF(NOT APR_BUILD_SHARED AND NOT APR_BUILD_STATIC) ++ MESSAGE(FATAL_ERROR "Both APR_BUILD_SHARED and APR_BUILD_STATIC have been disabled") ++ENDIF() ++ ++IF(NOT APR_BUILD_STATIC AND TEST_STATIC_LIBS) ++ MESSAGE(FATAL_ERROR "APR_BUILD_STATIC have been disabled, but TEST_STATIC_LIBS is enabled") ++ENDIF() ++ + # create 1-or-0 representation of feature tests for apr.h + + SET(apr_have_ipv6_10 0) +@@ -47,6 +74,13 @@ + SET(win32_winnt_str ${MIN_WINDOWS_VER}) + ENDIF() + ++# Read current version. ++FILE(STRINGS include/apr_version.h VERSION_STRINGS REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)") ++ ++STRING(REGEX REPLACE ".*#define APR_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) ++ + CONFIGURE_FILE(include/apr.hwc + ${PROJECT_BINARY_DIR}/apr.h) + +@@ -71,11 +105,11 @@ + # you've generated apr.h before using a different build + + SET(APR_INCLUDE_DIRECTORIES +- ${PROJECT_BINARY_DIR} +- ${CMAKE_CURRENT_SOURCE_DIR}/include +- ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/win32 +- ${CMAKE_CURRENT_SOURCE_DIR}/include/arch/unix +- ${CMAKE_CURRENT_SOURCE_DIR}/include/private ++ $ ++ $ ++ $ ++ $ ++ $ + ) + + SET(APR_SYSTEM_LIBS +@@ -261,27 +295,55 @@ + SET(install_bin_pdb) + + # libapr-1 is shared, apr-1 is static +-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) ++IF (APR_BUILD_SHARED) ++ ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) ++ LIST(APPEND install_targets ${apr_libname}) ++ LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/${apr_libname}.pdb) ++ TARGET_LINK_LIBRARIES(${apr_libname} ++ PRIVATE ${APR_SYSTEM_LIBS}) ++ TARGET_COMPILE_DEFINITIONS(${apr_libname} ++ PRIVATE "APR_DECLARE_EXPORT;WINNT" ++ INTERFACE "APR_DECLARE_IMPORT;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(${apr_libname} ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ INTERFACE $ ${APR_INCLUDE_DIRECTORIES} ++ ) ++ ADD_DEPENDENCIES(${apr_libname} test_char_header) ++ENDIF() + +-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) ++IF (APR_BUILD_STATIC) ++ ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) ++ LIST(APPEND install_targets ${apr_name}) ++ TARGET_LINK_LIBRARIES(${apr_name} ++ PRIVATE ${APR_SYSTEM_LIBS}) ++ TARGET_COMPILE_DEFINITIONS(${apr_name} ++ PRIVATE "APR_DECLARE_STATIC;WINNT" ++ INTERFACE "APR_DECLARE_STATIC;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(${apr_name} ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ INTERFACE $ ${APR_INCLUDE_DIRECTORIES} ++ ) ++ ADD_DEPENDENCIES(${apr_name} 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") ++IF (APR_BUILD_SHARED) ++ ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) ++ LIST(APPEND install_targets libaprapp-1) ++ SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(libaprapp-1 ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ ) ++ENDIF() + +-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_STATIC) ++ ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) ++ LIST(APPEND install_targets aprapp-1) ++ SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") ++ TARGET_INCLUDE_DIRECTORIES(aprapp-1 ++ PRIVATE ${APR_INCLUDE_DIRECTORIES} ++ ) ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -299,21 +361,16 @@ + ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt) + + IF(TEST_STATIC_LIBS) +- SET(whichapr apr-1) ++ SET(whichapr ${apr_name}) + SET(whichaprapp aprapp-1) +- SET(apiflag -DAPR_DECLARE_STATIC) + ELSE() +- SET(whichapr libapr-1) ++ SET(whichapr ${apr_libname}) + SET(whichaprapp libaprapp-1) +- SET(apiflag) + ENDIF() + + ADD_EXECUTABLE(testapp test/testapp.c) +- TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(testapp ${whichapr} ${whichaprapp}) + SET_TARGET_PROPERTIES(testapp PROPERTIES LINK_FLAGS /entry:wmainCRTStartup) +- IF(apiflag) +- SET_TARGET_PROPERTIES(testapp PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + ADD_TEST(NAME testapp COMMAND testapp) + + SET (APR_TEST_SOURCES +@@ -326,11 +383,8 @@ + ENDFOREACH() + + ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) +- TARGET_LINK_LIBRARIES(testall ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(testall ${whichapr} ws2_32.lib) + SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_DEFINITIONS "BINPATH=$") +- IF(apiflag) +- SET_TARGET_PROPERTIES(testall PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + + FOREACH(test ${APR_TEST_SUITES}) + ADD_TEST(NAME ${test} COMMAND testall -v ${test}) +@@ -337,7 +391,7 @@ + ENDFOREACH() + + ADD_LIBRARY(mod_test MODULE test/mod_test.c) +- TARGET_LINK_LIBRARIES(mod_test ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(mod_test ${whichapr}) + SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello) + # nasty work-around for difficulties adding more than one additional flag + # (they get joined in a bad way behind the scenes) +@@ -344,9 +398,6 @@ + GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS) + SET(link_flags "${link_flags} /export:count_reps") + SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags}) +- IF(apiflag) +- SET_TARGET_PROPERTIES(mod_test PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() + + # Build all the single-source executable files with no special build + # requirements. +@@ -370,11 +421,10 @@ + FOREACH(sourcefile ${single_source_programs}) + STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile}) + ADD_EXECUTABLE(${proggie} ${sourcefile}) +- TARGET_LINK_LIBRARIES(${proggie} ${whichapr} ${APR_SYSTEM_LIBS}) ++ TARGET_LINK_LIBRARIES(${proggie} ${whichapr}) + SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_DEFINITIONS "BINPATH=$") +- IF(apiflag) +- SET_TARGET_PROPERTIES(${proggie} PROPERTIES COMPILE_FLAGS ${apiflag}) +- ENDIF() ++ ++ ADD_DEPENDENCIES(testall ${proggie}) + ENDFOREACH() + + # Add tests for programs that run by themselves with no arguments. +@@ -400,13 +450,31 @@ + ENDIF (APR_BUILD_TESTAPR) + + # Installation ++INCLUDE(CMakePackageConfigHelpers) + +-INSTALL(TARGETS ${install_targets} ++string(TOLOWER "${PROJECT_NAME}" project_name_lower) ++ ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ VERSION ${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION} ++ COMPATIBILITY SameMajorVersion ++) ++ ++INSTALL(TARGETS ${install_targets} EXPORT apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib + ) + ++INSTALL(EXPORT apr-config ++ NAMESPACE apr:: ++ DESTINATION "lib/cmake/${project_name_lower}" ++ FILE "${project_name_lower}-config.cmake" ++) ++ ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ DESTINATION "lib/cmake/${project_name_lower}" ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin +@@ -438,6 +506,8 @@ + MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") + MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") + MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") ++MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") ++MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") + MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + IF(TEST_STATIC_LIBS) + MESSAGE(STATUS " (testing static libraries)") diff --git a/ports/apr/fix-configcmake.patch b/ports/apr/fix-configcmake.patch deleted file mode 100644 index 8104810d05f75e..00000000000000 --- a/ports/apr/fix-configcmake.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4632c3..0b86d12 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -259,27 +259,35 @@ 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) -- -+TARGET_INCLUDE_DIRECTORIES(libapr-1 INTERFACE $) -+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) -+TARGET_INCLUDE_DIRECTORIES(apr-1 INTERFACE $) -+ENDIF() - - # libaprapp-1 and aprapp-1 are static -+IF(BUILD_SHARED_LIBS) - 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") -- -+TARGET_INCLUDE_DIRECTORIES(libaprapp-1 INTERFACE $) -+ELSE() - 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") -+TARGET_INCLUDE_DIRECTORIES(aprapp-1 INTERFACE $) -+ENDIF() - - IF(APR_BUILD_TESTAPR) - ENABLE_TESTING() -@@ -385,12 +393,18 @@ ENDIF (APR_BUILD_TESTAPR) - - # Installation - --INSTALL(TARGETS ${install_targets} -+INSTALL(TARGETS ${install_targets} EXPORT unofficial-apr-config - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ) - -+INSTALL(EXPORT unofficial-apr-config -+ NAMESPACE unofficial::apr:: -+ DESTINATION share/unofficial-apr -+ FILE unofficial-apr-config.cmake -+) -+ - IF(INSTALL_PDB) - INSTALL(FILES ${install_bin_pdb} - DESTINATION bin diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 84b04326b5df8f..6a1e226ce85b3d 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -10,31 +10,41 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - fix-configcmake.patch + apr-r1917051+r1917283+r1917612.patch unglue.patch ) if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - private-headers APR_INSTALL_PRIVATE_H + FEATURES + private-headers INSTALL_PRIVATE_H ) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC) + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" APR_BUILD_SHARED) + + if (FEATURE_MINIMAL_BUILD) + set(APU_USE_EXPAT OFF) + else() + set(APU_USE_EXPAT ON) + endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DINSTALL_PDB=OFF - -DMIN_WINDOWS_VER=Windows7 - -DAPR_HAVE_IPV6=ON - ${FEATURE_OPTIONS} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAPR_BUILD_STATIC=${APR_BUILD_STATIC} + -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} + -DAPR_BUILD_TESTAPR=OFF + -DINSTALL_PDB=OFF + -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} ) vcpkg_cmake_install() - vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr) - # There is no way to suppress installation of the headers in debug builds. - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_copy_pdbs() + vcpkg_cmake_config_fixup(PACKAGE_NAME "apr" + CONFIG_PATH "lib/cmake/apr") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") else() # To cross-compile you will need a triplet file that locates the tool chain and sets --host and --cache parameters of "./configure". # The ${VCPKG_PLATFORM_TOOLSET}.cache file must have been generated on the targeted host using "./configure -C". @@ -92,5 +102,7 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 430a1faf430f8404b50f3cdd56b8710d27df6208 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:22:02 +0200 Subject: [PATCH 02/22] [apr] remove the `unglue.patch` file. --- ports/apr/portfile.cmake | 1 - ports/apr/unglue.patch | 17 ----------------- 2 files changed, 18 deletions(-) delete mode 100644 ports/apr/unglue.patch diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 6a1e226ce85b3d..1dccde15b5d2e7 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -11,7 +11,6 @@ vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES apr-r1917051+r1917283+r1917612.patch - unglue.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/apr/unglue.patch b/ports/apr/unglue.patch deleted file mode 100644 index 0ce518b8a7c209..00000000000000 --- a/ports/apr/unglue.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/apr_version.h b/include/apr_version.h -index e96de3835..de3437d71 100644 ---- a/include/apr_version.h -+++ b/include/apr_version.h -@@ -114,9 +114,9 @@ - - /** An alternative formatted string of APR's version */ - /* macro for Win32 .rc files using numeric csv representation */ --#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \ -- ##APR_MINOR_VERSION ##, \ -- ##APR_PATCH_VERSION -+#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION , \ -+ APR_MINOR_VERSION , \ -+ APR_PATCH_VERSION - - - #ifndef APR_VERSION_ONLY From 34e71f620f90762a17418375b3f9d8c4096476f4 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:30:27 +0200 Subject: [PATCH 03/22] [apr] add new version of the apr port. --- versions/a-/apr.json | 5 +++++ versions/baseline.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index f2acd7ee81996e..2e638d309fc681 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a84af91289cbb4a4001fe8e2741fc26c4011320", + "version": "1.7.4", + "port-version": 1 + }, { "git-tree": "106ba582ba3d56fd1db284670ed7d94b6cae9f47", "version": "1.7.4", diff --git a/versions/baseline.json b/versions/baseline.json index 5fa2c500897f5f..d6104d9228b807 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -166,7 +166,7 @@ }, "apr": { "baseline": "1.7.4", - "port-version": 0 + "port-version": 1 }, "apr-util": { "baseline": "1.6.3", From 9705b1bd87133a3467bc13d79e64ee5e68afd53a Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:33:37 +0200 Subject: [PATCH 04/22] [apr] add the port-version property to the vcpkg.json file. --- ports/apr/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index dafc8d0fa3c649..61822a23a8098d 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,6 +1,7 @@ { "name": "apr", "version": "1.7.4", + "port-version": 1, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "license": "Apache-2.0", From 3a215b092e0dc8341b6e5ba022e37c6938a28aa0 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:34:02 +0200 Subject: [PATCH 05/22] [apr] update git-tree. --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 2e638d309fc681..053be12bb85020 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "0a84af91289cbb4a4001fe8e2741fc26c4011320", + "git-tree": "398961ef72839e33e5c9e8dae8a9d558641aa9da", "version": "1.7.4", "port-version": 1 }, From fd949a56fa53664f4cc73aa25f4ccda8220f5a32 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:37:03 +0200 Subject: [PATCH 06/22] [apr] remove setting of the APU_USE_EXPAT variable; It is never used. --- ports/apr/portfile.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 1dccde15b5d2e7..f5d3e9d0ff0808 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -22,12 +22,6 @@ if (VCPKG_TARGET_IS_WINDOWS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" APR_BUILD_SHARED) - if (FEATURE_MINIMAL_BUILD) - set(APU_USE_EXPAT OFF) - else() - set(APU_USE_EXPAT ON) - endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS From 10924edeb88e6ce0f3923a7d5487be9df2d1ac24 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:39:39 +0200 Subject: [PATCH 07/22] [apr] add the license field to the vcpkg.json file. --- ports/apr/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index 61822a23a8098d..a66350be56de48 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -4,7 +4,6 @@ "port-version": 1, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", - "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ { From 7f2c048e2ef5ba4c06a13558ea8db74abf2d8d85 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:40:21 +0200 Subject: [PATCH 08/22] [apr] specify the `default-features` field to the vcpkg.json file. --- ports/apr/vcpkg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index a66350be56de48..d7a80fa52f341a 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -21,5 +21,6 @@ "private-headers": { "description": "Install non-standard files required for building Apache httpd" } - } + }, + "default-features": [] } From 8739ff17083a98a6c9f3b5570e98507c4f09e60c Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:50:20 +0200 Subject: [PATCH 09/22] [apr] run the `.\vcpkg.exe format-manifest` command. --- ports/apr/vcpkg.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index d7a80fa52f341a..a66350be56de48 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -21,6 +21,5 @@ "private-headers": { "description": "Install non-standard files required for building Apache httpd" } - }, - "default-features": [] + } } From 31d8dee5f847f76391a04a14d68803d4060f1527 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 15:50:34 +0200 Subject: [PATCH 10/22] [apr] update git-tree. --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 053be12bb85020..7afeaf1a2e32ed 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "398961ef72839e33e5c9e8dae8a9d558641aa9da", + "git-tree": "f950c9fa52cd40cce0e3608b4f90a1cb03630c1c", "version": "1.7.4", "port-version": 1 }, From 7158971cc58f0a5721bbe34350a1a6aa074fd171 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 16:14:36 +0200 Subject: [PATCH 11/22] Revert "[apr] remove the `unglue.patch` file." This reverts commit 430a1faf430f8404b50f3cdd56b8710d27df6208. --- ports/apr/portfile.cmake | 1 + ports/apr/unglue.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/apr/unglue.patch diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index f5d3e9d0ff0808..92b1f4c0e5a1c9 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES apr-r1917051+r1917283+r1917612.patch + unglue.patch ) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/apr/unglue.patch b/ports/apr/unglue.patch new file mode 100644 index 00000000000000..0ce518b8a7c209 --- /dev/null +++ b/ports/apr/unglue.patch @@ -0,0 +1,17 @@ +diff --git a/include/apr_version.h b/include/apr_version.h +index e96de3835..de3437d71 100644 +--- a/include/apr_version.h ++++ b/include/apr_version.h +@@ -114,9 +114,9 @@ + + /** An alternative formatted string of APR's version */ + /* macro for Win32 .rc files using numeric csv representation */ +-#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION ##, \ +- ##APR_MINOR_VERSION ##, \ +- ##APR_PATCH_VERSION ++#define APR_VERSION_STRING_CSV APR_MAJOR_VERSION , \ ++ APR_MINOR_VERSION , \ ++ APR_PATCH_VERSION + + + #ifndef APR_VERSION_ONLY From f33bab4295099f676cbde162ee163c9f19bab1ba Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 16:15:14 +0200 Subject: [PATCH 12/22] [apr] update git-tree. --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 7afeaf1a2e32ed..07364d0a2fbd3e 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "f950c9fa52cd40cce0e3608b4f90a1cb03630c1c", + "git-tree": "ec9726823ef8b47d54364f3692a8761eb941afc8", "version": "1.7.4", "port-version": 1 }, From b37ccc947def8dfc472fd8f7137c752fb509b555 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 16:21:00 +0200 Subject: [PATCH 13/22] [apr] add the license field to the vcpkg.json file. --- ports/apr/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index a66350be56de48..61822a23a8098d 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -4,6 +4,7 @@ "port-version": 1, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", + "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ { From fa826f088dded4b387a503ee6303ced0acbc7363 Mon Sep 17 00:00:00 2001 From: rinrab Date: Fri, 10 May 2024 16:21:18 +0200 Subject: [PATCH 14/22] [apr] update git-tree. --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 07364d0a2fbd3e..ac13921a869518 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ec9726823ef8b47d54364f3692a8761eb941afc8", + "git-tree": "76ec311948fea19b0945b5a73ba8f05ecb7d9d79", "version": "1.7.4", "port-version": 1 }, From 630d30efade2ffbdaa89e1c67fc6e5215800043e Mon Sep 17 00:00:00 2001 From: rinrab Date: Tue, 14 May 2024 20:56:56 +0200 Subject: [PATCH 15/22] [apr] generate patches per all revisions Patches are generated via the following command: ```powershell 1917051,1917065,1917283,1917612 | ForEach-Object { svn-diff https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x -c $_ -raw | Out-File "apr-r$_.patch" } ``` --- ports/apr/apr-r1917051.patch | 89 ++++++++++ ports/apr/apr-r1917065.patch | 13 ++ ...7283+r1917612.patch => apr-r1917283.patch} | 166 ++++++------------ ports/apr/apr-r1917612.patch | 56 ++++++ ports/apr/portfile.cmake | 5 +- 5 files changed, 217 insertions(+), 112 deletions(-) create mode 100644 ports/apr/apr-r1917051.patch create mode 100644 ports/apr/apr-r1917065.patch rename ports/apr/{apr-r1917051+r1917283+r1917612.patch => apr-r1917283.patch} (61%) create mode 100644 ports/apr/apr-r1917612.patch diff --git a/ports/apr/apr-r1917051.patch b/ports/apr/apr-r1917051.patch new file mode 100644 index 00000000000000..f3c92526c74a1c --- /dev/null +++ b/ports/apr/apr-r1917051.patch @@ -0,0 +1,89 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917050) ++++ CMakeLists.txt (revision 1917051) +@@ -25,10 +25,20 @@ + OPTION(APR_HAVE_IPV6 "IPv6 support" ON) + OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) + OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) ++OPTION(APR_BUILD_SHARED "Build shared libraries" ON) ++OPTION(APR_BUILD_STATIC "Build static libraries." ON) + OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) + SET(MIN_WINDOWS_VER "Vista" + CACHE STRING "Minimum Windows version") + ++IF(NOT APR_BUILD_SHARED AND NOT APR_BUILD_STATIC) ++ MESSAGE(FATAL_ERROR "Both APR_BUILD_SHARED and APR_BUILD_STATIC have been disabled") ++ENDIF() ++ ++IF(NOT APR_BUILD_STATIC AND TEST_STATIC_LIBS) ++ MESSAGE(FATAL_ERROR "APR_BUILD_STATIC have been disabled, but TEST_STATIC_LIBS is enabled") ++ENDIF() ++ + # create 1-or-0 representation of feature tests for apr.h + + SET(apr_have_ipv6_10 0) +@@ -267,27 +277,35 @@ + ENDIF() + + # libapr-1 is shared, apr-1 is static +-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) ++IF (APR_BUILD_SHARED) ++ 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) ++ENDIF() + +-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) ++IF (APR_BUILD_STATIC) ++ 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") ++IF (APR_BUILD_SHARED) ++ 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") ++ENDIF() + +-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_STATIC) ++ 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") ++ENDIF() + + IF(APR_BUILD_TESTAPR) + ENABLE_TESTING() +@@ -443,7 +461,8 @@ + MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") + MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") + MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") +-MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") ++MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") ++MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") + MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + IF(TEST_STATIC_LIBS) + MESSAGE(STATUS " (testing static libraries)") + diff --git a/ports/apr/apr-r1917065.patch b/ports/apr/apr-r1917065.patch new file mode 100644 index 00000000000000..db96b960ffd0f0 --- /dev/null +++ b/ports/apr/apr-r1917065.patch @@ -0,0 +1,13 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917064) ++++ CMakeLists.txt (revision 1917065) +@@ -461,6 +461,7 @@ + MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") + MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") + MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") ++MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") + MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") + MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") + MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") + diff --git a/ports/apr/apr-r1917051+r1917283+r1917612.patch b/ports/apr/apr-r1917283.patch similarity index 61% rename from ports/apr/apr-r1917051+r1917283+r1917612.patch rename to ports/apr/apr-r1917283.patch index 0b0a9b516e8095..e0ddcc29121a7c 100644 --- a/ports/apr/apr-r1917051+r1917283+r1917612.patch +++ b/ports/apr/apr-r1917283.patch @@ -1,21 +1,11 @@ -Index: . -=================================================================== ---- . (revision 1917624) -+++ . (working copy) - -Property changes on: . -___________________________________________________________________ -Modified: svn:mergeinfo -## -0,0 +0,3 ## - Merged /apr/apr/branches/1.7.x:r1917051,1917065,1917283,1917612 - Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 - Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250,1917604 Index: CHANGES =================================================================== ---- CHANGES (revision 1917624) -+++ CHANGES (working copy) -@@ -1,4 +1,12 @@ - -*- coding: utf-8 -*- +--- CHANGES (revision 1917282) ++++ CHANGES (revision 1917283) +@@ -10,6 +10,14 @@ + *) Improve platform detection by updating config.guess and config.sub. + [Rainer Jung] + + *) CMake: Add support for CMAKE_WARNING_AS_ERROR. [Ivan Zhakov] + + *) CMake: Enable support for MSVC runtime library selection by abstraction. @@ -29,9 +19,9 @@ Index: CHANGES *) Fix a regression where writing to a file opened with both APR_FOPEN_APPEND Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 1917624) -+++ CMakeLists.txt (working copy) -@@ -21,14 +21,41 @@ +--- CMakeLists.txt (revision 1917282) ++++ CMakeLists.txt (revision 1917283) +@@ -21,6 +21,23 @@ PROJECT(APR C) @@ -55,39 +45,7 @@ Index: CMakeLists.txt OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) - OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) -+OPTION(APR_BUILD_SHARED "Build shared libraries" ON) -+OPTION(APR_BUILD_STATIC "Build static libraries." ON) - OPTION(TEST_STATIC_LIBS "Test programs use APR static libraries instead of shared libraries?" OFF) - SET(MIN_WINDOWS_VER "Vista" - CACHE STRING "Minimum Windows version") - -+IF(NOT APR_BUILD_SHARED AND NOT APR_BUILD_STATIC) -+ MESSAGE(FATAL_ERROR "Both APR_BUILD_SHARED and APR_BUILD_STATIC have been disabled") -+ENDIF() -+ -+IF(NOT APR_BUILD_STATIC AND TEST_STATIC_LIBS) -+ MESSAGE(FATAL_ERROR "APR_BUILD_STATIC have been disabled, but TEST_STATIC_LIBS is enabled") -+ENDIF() -+ - # create 1-or-0 representation of feature tests for apr.h - - SET(apr_have_ipv6_10 0) -@@ -47,6 +74,13 @@ - SET(win32_winnt_str ${MIN_WINDOWS_VER}) - ENDIF() - -+# Read current version. -+FILE(STRINGS include/apr_version.h VERSION_STRINGS REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)") -+ -+STRING(REGEX REPLACE ".*#define APR_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) -+STRING(REGEX REPLACE ".*#define APR_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) -+STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) -+ - CONFIGURE_FILE(include/apr.hwc - ${PROJECT_BINARY_DIR}/apr.h) - -@@ -71,11 +105,11 @@ +@@ -81,11 +98,11 @@ # you've generated apr.h before using a different build SET(APR_INCLUDE_DIRECTORIES @@ -104,17 +62,16 @@ Index: CMakeLists.txt ) SET(APR_SYSTEM_LIBS -@@ -261,27 +295,55 @@ - SET(install_bin_pdb) +@@ -278,33 +295,53 @@ # libapr-1 is shared, apr-1 is static --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) -+IF (APR_BUILD_SHARED) + IF (APR_BUILD_SHARED) +- 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) + ADD_LIBRARY(${apr_libname} SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) + LIST(APPEND install_targets ${apr_libname}) + LIST(APPEND install_bin_pdb ${PROJECT_BINARY_DIR}/${apr_libname}.pdb) @@ -128,14 +85,14 @@ Index: CMakeLists.txt + INTERFACE $ ${APR_INCLUDE_DIRECTORIES} + ) + ADD_DEPENDENCIES(${apr_libname} test_char_header) -+ENDIF() + ENDIF() --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) -+IF (APR_BUILD_STATIC) + IF (APR_BUILD_STATIC) +- 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) + ADD_LIBRARY(${apr_name} STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED}) + LIST(APPEND install_targets ${apr_name}) + TARGET_LINK_LIBRARIES(${apr_name} @@ -148,36 +105,31 @@ Index: CMakeLists.txt + INTERFACE $ ${APR_INCLUDE_DIRECTORIES} + ) + ADD_DEPENDENCIES(${apr_name} test_char_header) -+ENDIF() + 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") -+IF (APR_BUILD_SHARED) -+ ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + IF (APR_BUILD_SHARED) + 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) + LIST(APPEND install_targets libaprapp-1) -+ SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") + SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT") + TARGET_INCLUDE_DIRECTORIES(libaprapp-1 + PRIVATE ${APR_INCLUDE_DIRECTORIES} + ) -+ENDIF() + ENDIF() --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_STATIC) -+ ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED}) + IF (APR_BUILD_STATIC) + 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) + LIST(APPEND install_targets aprapp-1) -+ SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") + SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT") + TARGET_INCLUDE_DIRECTORIES(aprapp-1 + PRIVATE ${APR_INCLUDE_DIRECTORIES} + ) -+ENDIF() + ENDIF() IF(APR_BUILD_TESTAPR) - ENABLE_TESTING() -@@ -299,21 +361,16 @@ +@@ -323,21 +360,16 @@ ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt) IF(TEST_STATIC_LIBS) @@ -202,7 +154,7 @@ Index: CMakeLists.txt ADD_TEST(NAME testapp COMMAND testapp) SET (APR_TEST_SOURCES -@@ -326,11 +383,8 @@ +@@ -350,11 +382,8 @@ ENDFOREACH() ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) @@ -215,7 +167,7 @@ Index: CMakeLists.txt FOREACH(test ${APR_TEST_SUITES}) ADD_TEST(NAME ${test} COMMAND testall -v ${test}) -@@ -337,7 +391,7 @@ +@@ -361,7 +390,7 @@ ENDFOREACH() ADD_LIBRARY(mod_test MODULE test/mod_test.c) @@ -224,7 +176,7 @@ Index: CMakeLists.txt SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello) # nasty work-around for difficulties adding more than one additional flag # (they get joined in a bad way behind the scenes) -@@ -344,9 +398,6 @@ +@@ -368,9 +397,6 @@ GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS) SET(link_flags "${link_flags} /export:count_reps") SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags}) @@ -234,7 +186,7 @@ Index: CMakeLists.txt # Build all the single-source executable files with no special build # requirements. -@@ -370,11 +421,10 @@ +@@ -394,11 +420,10 @@ FOREACH(sourcefile ${single_source_programs}) STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile}) ADD_EXECUTABLE(${proggie} ${sourcefile}) @@ -249,20 +201,13 @@ Index: CMakeLists.txt ENDFOREACH() # Add tests for programs that run by themselves with no arguments. -@@ -400,13 +450,31 @@ +@@ -424,13 +449,20 @@ ENDIF (APR_BUILD_TESTAPR) # Installation -+INCLUDE(CMakePackageConfigHelpers) ++string(TOLOWER "${PROJECT_NAME}" project_name_lower) -INSTALL(TARGETS ${install_targets} -+string(TOLOWER "${PROJECT_NAME}" project_name_lower) -+ -+write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" -+ VERSION ${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION} -+ COMPATIBILITY SameMajorVersion -+) -+ +INSTALL(TARGETS ${install_targets} EXPORT apr-config RUNTIME DESTINATION bin LIBRARY DESTINATION lib @@ -274,20 +219,19 @@ Index: CMakeLists.txt + DESTINATION "lib/cmake/${project_name_lower}" + FILE "${project_name_lower}-config.cmake" +) -+ -+INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" -+ DESTINATION "lib/cmake/${project_name_lower}" -+) + IF(INSTALL_PDB) INSTALL(FILES ${install_bin_pdb} DESTINATION bin -@@ -438,6 +506,8 @@ - MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") - MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") - MESSAGE(STATUS " Minimum Windows version ......... : ${MIN_WINDOWS_VER}") -+MESSAGE(STATUS " Build shared libs ............... : ${APR_BUILD_SHARED}") -+MESSAGE(STATUS " Build static libs ............... : ${APR_BUILD_STATIC}") - MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") - IF(TEST_STATIC_LIBS) - MESSAGE(STATUS " (testing static libraries)") +Index: . +=================================================================== +--- . (revision 1917282) ++++ . (revision 1917283) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,2 ## + Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 + Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250 + diff --git a/ports/apr/apr-r1917612.patch b/ports/apr/apr-r1917612.patch new file mode 100644 index 00000000000000..fbce1dd2f15781 --- /dev/null +++ b/ports/apr/apr-r1917612.patch @@ -0,0 +1,56 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917611) ++++ CMakeLists.txt (revision 1917612) +@@ -74,6 +74,13 @@ + SET(win32_winnt_str ${MIN_WINDOWS_VER}) + ENDIF() + ++# Read current version. ++FILE(STRINGS include/apr_version.h VERSION_STRINGS REGEX "#define (APR_MAJOR_VERSION|APR_MINOR_VERSION|APR_PATCH_VERSION)") ++ ++STRING(REGEX REPLACE ".*#define APR_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MAJOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" APR_MINOR_VERSION ${VERSION_STRINGS}) ++STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PATCH_VERSION ${VERSION_STRINGS}) ++ + CONFIGURE_FILE(include/apr.hwc + ${PROJECT_BINARY_DIR}/apr.h) + +@@ -449,8 +456,15 @@ + ENDIF (APR_BUILD_TESTAPR) + + # Installation ++INCLUDE(CMakePackageConfigHelpers) ++ + string(TOLOWER "${PROJECT_NAME}" project_name_lower) + ++write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ VERSION ${APR_MAJOR_VERSION}.${APR_MINOR_VERSION}.${APR_PATCH_VERSION} ++ COMPATIBILITY SameMajorVersion ++) ++ + INSTALL(TARGETS ${install_targets} EXPORT apr-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +@@ -463,6 +477,10 @@ + FILE "${project_name_lower}-config.cmake" + ) + ++INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${project_name_lower}-config-version.cmake" ++ DESTINATION "lib/cmake/${project_name_lower}" ++) ++ + IF(INSTALL_PDB) + INSTALL(FILES ${install_bin_pdb} + DESTINATION bin +Index: . +=================================================================== +--- . (revision 1917611) ++++ . (revision 1917612) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,1 ## + Merged /apr/apr/trunk:r1917604 + diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 92b1f4c0e5a1c9..50f1a23fe30429 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -10,7 +10,10 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(SOURCE_PATH ARCHIVE "${ARCHIVE}" PATCHES - apr-r1917051+r1917283+r1917612.patch + apr-r1917051.patch + apr-r1917065.patch + apr-r1917283.patch + apr-r1917612.patch unglue.patch ) From f23193dc7bcc1403018d87fda81391357216943c Mon Sep 17 00:00:00 2001 From: rinrab Date: Tue, 14 May 2024 21:05:20 +0200 Subject: [PATCH 16/22] [apr] fix patch appling * apr-r1917051.patch: Replace ENDIF() with SET(install_bin_pdb) in context. * apr-r1917283.patch: Remove changes in the CHANGES file because it doesn't affect on the result. --- ports/apr/apr-r1917051.patch | 18 +++++----- ports/apr/apr-r1917283.patch | 69 +++++++++++++----------------------- 2 files changed, 34 insertions(+), 53 deletions(-) diff --git a/ports/apr/apr-r1917051.patch b/ports/apr/apr-r1917051.patch index f3c92526c74a1c..ff3da9f475077a 100644 --- a/ports/apr/apr-r1917051.patch +++ b/ports/apr/apr-r1917051.patch @@ -1,8 +1,8 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 1917050) -+++ CMakeLists.txt (revision 1917051) -@@ -25,10 +25,20 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917050) ++++ CMakeLists.txt (revision 1917051) +@@ -25,10 +25,20 @@ OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) OPTION(APR_BUILD_TESTAPR "Build the test suite" OFF) @@ -23,8 +23,8 @@ Index: CMakeLists.txt # create 1-or-0 representation of feature tests for apr.h SET(apr_have_ipv6_10 0) -@@ -267,27 +277,35 @@ - ENDIF() +@@ -267,27 +277,35 @@ + SET(install_bin_pdb) # libapr-1 is shared, apr-1 is static -ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc) @@ -76,7 +76,7 @@ Index: CMakeLists.txt IF(APR_BUILD_TESTAPR) ENABLE_TESTING() -@@ -443,7 +461,8 @@ +@@ -443,7 +461,8 @@ MESSAGE(STATUS " Install prefix .................. : ${CMAKE_INSTALL_PREFIX}") MESSAGE(STATUS " C compiler ...................... : ${CMAKE_C_COMPILER}") MESSAGE(STATUS " IPv6 ............................ : ${APR_HAVE_IPV6}") @@ -86,4 +86,4 @@ Index: CMakeLists.txt MESSAGE(STATUS " Build test suite ................ : ${APR_BUILD_TESTAPR}") IF(TEST_STATIC_LIBS) MESSAGE(STATUS " (testing static libraries)") - + diff --git a/ports/apr/apr-r1917283.patch b/ports/apr/apr-r1917283.patch index e0ddcc29121a7c..787414b7312482 100644 --- a/ports/apr/apr-r1917283.patch +++ b/ports/apr/apr-r1917283.patch @@ -1,27 +1,8 @@ -Index: CHANGES -=================================================================== ---- CHANGES (revision 1917282) -+++ CHANGES (revision 1917283) -@@ -10,6 +10,14 @@ - *) Improve platform detection by updating config.guess and config.sub. - [Rainer Jung] - -+ *) CMake: Add support for CMAKE_WARNING_AS_ERROR. [Ivan Zhakov] -+ -+ *) CMake: Enable support for MSVC runtime library selection by abstraction. -+ [Ivan Zhakov] -+ -+ *) CMake: Export installed targets (libapr-1, apr-1, libaprapp-1, aprapp-1) -+ to apr:: namespace. [Ivan Zhakov] -+ - Changes for APR 1.7.4 - - *) Fix a regression where writing to a file opened with both APR_FOPEN_APPEND -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 1917282) -+++ CMakeLists.txt (revision 1917283) -@@ -21,6 +21,23 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1917282) ++++ CMakeLists.txt (revision 1917283) +@@ -21,6 +21,23 @@ PROJECT(APR C) @@ -45,7 +26,7 @@ Index: CMakeLists.txt OPTION(APR_INSTALL_PRIVATE_H "Install selected private .h files (for httpd)" OFF) OPTION(APR_HAVE_IPV6 "IPv6 support" ON) OPTION(INSTALL_PDB "Install .pdb files (if generated)" ON) -@@ -81,11 +98,11 @@ +@@ -81,11 +98,11 @@ # you've generated apr.h before using a different build SET(APR_INCLUDE_DIRECTORIES @@ -62,7 +43,7 @@ Index: CMakeLists.txt ) SET(APR_SYSTEM_LIBS -@@ -278,33 +295,53 @@ +@@ -278,33 +295,53 @@ # libapr-1 is shared, apr-1 is static IF (APR_BUILD_SHARED) @@ -129,7 +110,7 @@ Index: CMakeLists.txt ENDIF() IF(APR_BUILD_TESTAPR) -@@ -323,21 +360,16 @@ +@@ -323,21 +360,16 @@ ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt) IF(TEST_STATIC_LIBS) @@ -154,7 +135,7 @@ Index: CMakeLists.txt ADD_TEST(NAME testapp COMMAND testapp) SET (APR_TEST_SOURCES -@@ -350,11 +382,8 @@ +@@ -350,11 +382,8 @@ ENDFOREACH() ADD_EXECUTABLE(testall ${APR_TEST_SOURCES}) @@ -167,7 +148,7 @@ Index: CMakeLists.txt FOREACH(test ${APR_TEST_SUITES}) ADD_TEST(NAME ${test} COMMAND testall -v ${test}) -@@ -361,7 +390,7 @@ +@@ -361,7 +390,7 @@ ENDFOREACH() ADD_LIBRARY(mod_test MODULE test/mod_test.c) @@ -176,7 +157,7 @@ Index: CMakeLists.txt SET_PROPERTY(TARGET mod_test APPEND PROPERTY LINK_FLAGS /export:print_hello) # nasty work-around for difficulties adding more than one additional flag # (they get joined in a bad way behind the scenes) -@@ -368,9 +397,6 @@ +@@ -368,9 +397,6 @@ GET_PROPERTY(link_flags TARGET mod_test PROPERTY LINK_FLAGS) SET(link_flags "${link_flags} /export:count_reps") SET_TARGET_PROPERTIES(mod_test PROPERTIES LINK_FLAGS ${link_flags}) @@ -186,7 +167,7 @@ Index: CMakeLists.txt # Build all the single-source executable files with no special build # requirements. -@@ -394,11 +420,10 @@ +@@ -394,11 +420,10 @@ FOREACH(sourcefile ${single_source_programs}) STRING(REGEX REPLACE ".*/([^\\]+)\\.c" "\\1" proggie ${sourcefile}) ADD_EXECUTABLE(${proggie} ${sourcefile}) @@ -201,7 +182,7 @@ Index: CMakeLists.txt ENDFOREACH() # Add tests for programs that run by themselves with no arguments. -@@ -424,13 +449,20 @@ +@@ -424,13 +449,20 @@ ENDIF (APR_BUILD_TESTAPR) # Installation @@ -223,15 +204,15 @@ Index: CMakeLists.txt IF(INSTALL_PDB) INSTALL(FILES ${install_bin_pdb} DESTINATION bin -Index: . -=================================================================== ---- . (revision 1917282) -+++ . (revision 1917283) - -Property changes on: . -___________________________________________________________________ -Modified: svn:mergeinfo -## -0,0 +0,2 ## - Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 - Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250 - +Index: . +=================================================================== +--- . (revision 1917282) ++++ . (revision 1917283) + +Property changes on: . +___________________________________________________________________ +Modified: svn:mergeinfo +## -0,0 +0,2 ## + Merged /apr/apr/branches/1.7.x-cmake-improvements:r1917214-1917282 + Merged /apr/apr/trunk:r1895471,1895519-1895520,1902517,1905416,1917107,1917109,1917112,1917114-1917115,1917162,1917250 + From abd7de0d4583a20e6ba120253c32a635ed0b5096 Mon Sep 17 00:00:00 2001 From: rinrab Date: Tue, 14 May 2024 21:05:41 +0200 Subject: [PATCH 17/22] [apr] update git-tree --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index ac13921a869518..8f0b4a0d689ed2 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "76ec311948fea19b0945b5a73ba8f05ecb7d9d79", + "git-tree": "a95e7bfc59b7a324aec65fee3b1d6f52f50b246d", "version": "1.7.4", "port-version": 1 }, From faa5eb2e887cd0488e7f951099fc009b83baf1c9 Mon Sep 17 00:00:00 2001 From: rinrab Date: Wed, 15 May 2024 19:12:37 +0200 Subject: [PATCH 18/22] [apr] revert accedently changed indentation in the portfile.cmake. --- ports/apr/portfile.cmake | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 50f1a23fe30429..28a5a5af321ac7 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -19,21 +19,21 @@ vcpkg_extract_source_archive(SOURCE_PATH if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - private-headers INSTALL_PRIVATE_H + FEATURES + private-headers INSTALL_PRIVATE_H ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" APR_BUILD_SHARED) vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DAPR_BUILD_STATIC=${APR_BUILD_STATIC} - -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} - -DAPR_BUILD_TESTAPR=OFF - -DINSTALL_PDB=OFF - -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DAPR_BUILD_STATIC=${APR_BUILD_STATIC} + -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} + -DAPR_BUILD_TESTAPR=OFF + -DINSTALL_PDB=OFF + -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} ) vcpkg_cmake_install() From eb50a78ac4228b4648dde0d7867aa99c32829ae6 Mon Sep 17 00:00:00 2001 From: rinrab Date: Wed, 15 May 2024 19:12:46 +0200 Subject: [PATCH 19/22] [apr] update git-tree --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 8f0b4a0d689ed2..a470d140e0a3b9 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a95e7bfc59b7a324aec65fee3b1d6f52f50b246d", + "git-tree": "b6c7def89757aa3d8b226e9fe63ec9fbf10a4b0a", "version": "1.7.4", "port-version": 1 }, From e0e345420fc5fec27f0310ca55193601413f2d20 Mon Sep 17 00:00:00 2001 From: rinrab Date: Thu, 16 May 2024 14:31:28 +0200 Subject: [PATCH 20/22] [apr] use the FEATURE_OPTIONS variable to pass features to the cmake configure command. --- ports/apr/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 28a5a5af321ac7..aa12bb84559acf 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_extract_source_archive(SOURCE_PATH if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - private-headers INSTALL_PRIVATE_H + private-headers APR_INSTALL_PRIVATE_H ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" APR_BUILD_STATIC) @@ -33,7 +33,7 @@ if (VCPKG_TARGET_IS_WINDOWS) -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} -DAPR_BUILD_TESTAPR=OFF -DINSTALL_PDB=OFF - -DAPR_INSTALL_PRIVATE_H=${INSTALL_PRIVATE_H} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() From b1e6e059eaa960c30a05bef0f8bc671b9878d9a7 Mon Sep 17 00:00:00 2001 From: rinrab Date: Thu, 16 May 2024 14:33:34 +0200 Subject: [PATCH 21/22] [apr] revert setting of the MIN_WINDOWS_VER and APR_HAVE_IPV6 variables. --- ports/apr/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index aa12bb84559acf..44a01ff5527193 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -33,6 +33,8 @@ if (VCPKG_TARGET_IS_WINDOWS) -DAPR_BUILD_SHARED=${APR_BUILD_SHARED} -DAPR_BUILD_TESTAPR=OFF -DINSTALL_PDB=OFF + -DMIN_WINDOWS_VER=Windows7 + -DAPR_HAVE_IPV6=ON ${FEATURE_OPTIONS} ) From a3479505eafe9244079977bf3f8a247cfea5042f Mon Sep 17 00:00:00 2001 From: rinrab Date: Thu, 16 May 2024 14:34:37 +0200 Subject: [PATCH 22/22] [apr] update git-tree --- versions/a-/apr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/a-/apr.json b/versions/a-/apr.json index a470d140e0a3b9..f37b68650e3b74 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b6c7def89757aa3d8b226e9fe63ec9fbf10a4b0a", + "git-tree": "f1c1420b7adeb7ffa29ea98f687ae3d8cf1a2491", "version": "1.7.4", "port-version": 1 },