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.

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

Jump to bottom

[apr] bump to 1.7.5 and did some imporvements, availible from this version of the library. #40742

Merged
merged 18 commits into from
Sep 3, 2024
Merged

[apr] bump to 1.7.5 and did some imporvements, availible from this version of the library. #40742

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
55b6a8f
[apr] bump port version and the hash of the source archive.
rinrab Aug 31, 2024
42024ea
[apr] fix cmake config to be official
rinrab Aug 31, 2024
9b5746c
[apr] fix library linkage selection
rinrab Aug 31, 2024
4eaba0f
[apr] disable tests to improve the build performance.
rinrab Aug 31, 2024
898b5ff
[apr] install include files into the directory with 'apr-1' prefix
rinrab Aug 31, 2024
1994d9d
[apr] generate new version info
rinrab Aug 31, 2024
e437799
[apr] revert changed include directory.
rinrab Aug 31, 2024
55eff6f
[apr] do not specify the package name in config-fixup; rely it to vcpkg.
rinrab Aug 31, 2024
e0e4e79
[apr] update git-tree in version info.
rinrab Aug 31, 2024
99cdfe6
[apr] add config for unofficial-apr package, that forwards to APR wit…
rinrab Aug 31, 2024
d3905cc
[apr] update git-tree in version info.
rinrab Aug 31, 2024
14e82f1
[apr] follow up to commit 99cdfe639dfaad4589932aa2079a176027d51c95: f…
rinrab Aug 31, 2024
97e6c9b
[apr] follow up to commit 99cdfe639dfaad4589932aa2079a176027d51c95: u…
rinrab Aug 31, 2024
02461e8
[apr] update git-tree in version info.
rinrab Aug 31, 2024
ce0ef6f
[apr] fix unofficial-apr target creation
rinrab Sep 1, 2024
eb7b88b
[apr] update git-tree in version info.
rinrab Sep 1, 2024
c604cdf
[apr] do not specify port-version, since it is first for the new version
rinrab Sep 2, 2024
b8e1bde
[apr] regenerate version info
rinrab Sep 2, 2024
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
62 changes: 0 additions & 62 deletions ports/apr/fix-configcmake.patch
View file
Open in desktop

This file was deleted.

14 changes: 10 additions & 4 deletions ports/apr/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@

set(VERSION 1.7.4)
set(VERSION 1.7.5)

vcpkg_download_distfile(ARCHIVE
URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
FILENAME "apr-${VERSION}.tar.bz2"
SHA512 2342c997765ea2ca96eac158e5fd260232dba68fc41b90a79a7ba9b25c539fc217981867362090e0ebebe632289257c342275e3c5baedb698c474ef8f49a9dcd
SHA512 d8a7553642da0c81261ac3992536efd9d43ecb9154934ef1a10ae808d6a3ce8198b40433091d3a6d04f61e67c59426fb5276193a37e810ae4bc74a8a10fb651b
)

vcpkg_extract_source_archive(SOURCE_PATH
ARCHIVE "${ARCHIVE}"
PATCHES
fix-configcmake.patch
unglue.patch
)

Expand All @@ -20,17 +19,24 @@ if (VCPKG_TARGET_IS_WINDOWS)
private-headers APR_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
-DMIN_WINDOWS_VER=Windows7
-DAPR_HAVE_IPV6=ON
-DAPR_INSTALL_INCLUDE_DIR=include/apr-1
rinrab marked this conversation as resolved.
Show resolved Hide resolved
${FEATURE_OPTIONS}
)

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-apr CONFIG_PATH share/unofficial-apr)
vcpkg_cmake_config_fixup(PACKAGE_NAME "apr" CONFIG_PATH "lib/cmake/apr")
rinrab marked this conversation as resolved.
Show resolved Hide resolved
# There is no way to suppress installation of the headers in debug builds.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

Expand Down
2 changes: 1 addition & 1 deletion ports/apr/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apr",
"version": "1.7.4",
"version": "1.7.5",
"port-version": 1,
rinrab marked this conversation as resolved.
Show resolved Hide resolved
"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/",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/apr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ad555ff147bbed1099a0eb8c8b017be4e0404b2",
"version": "1.7.5",
"port-version": 1
},
{
"git-tree": "9e28cc50d8877ee9c7a70e3fac694e562b4833da",
"version": "1.7.4",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"port-version": 0
},
"apr": {
"baseline": "1.7.4",
"baseline": "1.7.5",
"port-version": 1
},
"apr-util": {
Expand Down
Loading