[apr] fix CMake config via patch from the stable branch. #38674

rinrab · 2024-05-10T13:18:13Z

Some of the changes made in patch which fixes CMake config in the apr port were moved to the upstream. I added these changes the port via patch, made from upstream.

Use patch with changes from the stable branch to fix CMake config instead of the fix-configcmake.patch file; Remove yhis file.
Take windows part of the portfile.cmake file from stable branch of apr.
Change CMake namespace from unofficial-apr to just apr, patch is now taken 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.

This reverts commit 430a1fa.

WangWeiLin-MV · 2024-05-11T05:06:47Z

Local attempt to apply upstream-diff, but failed.

vcpkg_download_distfile(PATCH_APR_1917612_FROM_1909837
    URLS "https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch"
    FILENAME "PATCH_APR_1917612_FROM_1909837.diff"
    SHA512 4bd8943d224bf90ec215c3f09d3c1ca44ba732db245ca2eb65092a71d1ce3b7aa9b444654c155857a8bfd26adb1934af2be1563bd4317518ebdceab0f816709b
)
file(COPY_FILE "${PATCH_APR_1917612_FROM_1909837}" "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"}
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
    "apr/apr/branches/1.7.x/CMakeLists.txt"
    "CMakeLists.txt"
)

vcpkg_extract_source_archive(SOURCE_PATH
    ARCHIVE "${ARCHIVE}"
    PATCHES
        "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
        unglue.patch
)

@rinrab Could you help apply patches by this method?

WangWeiLin-MV

Patch diffs are basically the same, and can be viewed via compare the pull-diff
https://github.com/microsoft/vcpkg/blob/fa826f088dded4b387a503ee6303ced0acbc7363/ports/apr/apr-r1917051%2Br1917283%2Br1917612.patch
and upstream-diff
https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch

Edit: Newer changes, test invalid
~~The port usage tests pass with the following triplets:~~

~~x64-windows~~

rinrab · 2024-05-11T09:27:02Z

@WangWeiLin-MV I checked this problem and I found that the patch works as well.

I did the following:

Checkout the tag of the repository from https://svn.apache.org/repos/asf/apr/apr/tags/1.7.4/
Apply the patch via svn: svn patch path\to\patch\apr-r1917051+r1917283+r1917612.patch

I also tried to do it via git: cat path\to\patch\apr-r1917051+r1917283+r1917612.patch | git apply and it worked.

Maybe you tried to apply this patch to the stable or trunk branch.

WangWeiLin-MV · 2024-05-11T09:38:38Z

@rinrab Sorry for not clarify, the patches in this PR can be applied. My local attempt is using the patch downloaded from the link mentioned.

If possible, we prefer patches by downloading upstream patches like this rather than add patches to the port.

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" } ```

* 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.

rinrab · 2024-05-14T19:33:32Z

I don't think that this solution is good because:

viewvc is not an official apache resource. The only resources that are official are downloads.apache.org, archive.apache.org, dlcdn.apache.org, and svn.apache.org over the Subversion protocols.
The diff is being regenerated on every request, so this is not a static content.
Diff format which is used could be changed.

For better clarity I separated that patch by each revision.

rinrab · 2024-05-14T19:47:28Z

Local attempt to apply upstream-diff, but failed.

vcpkg_download_distfile(PATCH_APR_1917612_FROM_1909837
    URLS "https://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CMakeLists.txt?r1=1917612&r2=1909837&view=patch"
    FILENAME "PATCH_APR_1917612_FROM_1909837.diff"
    SHA512 4bd8943d224bf90ec215c3f09d3c1ca44ba732db245ca2eb65092a71d1ce3b7aa9b444654c155857a8bfd26adb1934af2be1563bd4317518ebdceab0f816709b
)
file(COPY_FILE "${PATCH_APR_1917612_FROM_1909837}" "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"}
vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
    "apr/apr/branches/1.7.x/CMakeLists.txt"
    "CMakeLists.txt"
)

vcpkg_extract_source_archive(SOURCE_PATH
    ARCHIVE "${ARCHIVE}"
    PATCHES
        "${CURRENT_BUILDTREES_DIR}/patches/PATCH_APR_1917612_FROM_1909837.diff"
        unglue.patch
)

@rinrab Could you help apply patches by this method?

Your attempt failed because the context in patch was wrong.

When patch is applying, it looks at the lines before and after. However they were changed in the '1.7.x' branch before these changes. It's required to fix them like I did here: f23193d (In github webiu it looks so strange. I don't know why)

ports/apr/portfile.cmake

rinrab · 2024-05-15T17:31:25Z

Edit: Newer changes, test invalid

I just checked, in my environment it does work in x64-windows and x64-windows-static.

WangWeiLin-MV

@rinrab Therefore, it should change the variable corresponding to feature private-headers to APR_INSTALL_PRIVATE_H. Moreover, FEATURE_OPTIONS clearly pass the options and it is recorded in the features of vcpkg.json.

ports/apr/portfile.cmake

…configure command.

rinrab · 2024-05-16T12:40:35Z

@rinrab Therefore, it should change the variable corresponding to feature private-headers to APR_INSTALL_PRIVATE_H. Moreover, FEATURE_OPTIONS clearly pass the options and it is recorded in the features of vcpkg.json.

I committed these suggestions in e0e3454, however I prefer to follow the APR's upstream version of the portfile.

data-queue · 2024-05-16T20:31:34Z

These are significant patches. Could we vcpkg_download_distfile the patches from the official mirror at https://github.com/apache/apr

rinrab · 2024-08-31T13:04:42Z

Those have been released as APR of version 1.7.5. I opened a pull-request at #40742 with bumping the version and adding some features from this pull-request.

rinrab changed the title ~~[apr] fixes CMake config via patch from the stable branch.~~ [apr] fix CMake config via patch from the stable branch. May 10, 2024

rinrab added 13 commits May 10, 2024 15:22

[apr] remove the unglue.patch file.

430a1fa

[apr] add new version of the apr port.

34e71f6

[apr] add the port-version property to the vcpkg.json file.

9705b1b

[apr] update git-tree.

3a215b0

[apr] remove setting of the APU_USE_EXPAT variable; It is never used.

fd949a5

[apr] add the license field to the vcpkg.json file.

10924ed

[apr] specify the default-features field to the vcpkg.json file.

7f2c048

[apr] run the .\vcpkg.exe format-manifest command.

8739ff1

[apr] update git-tree.

31d8dee

Revert "[apr] remove the unglue.patch file."

7158971

This reverts commit 430a1fa.

[apr] update git-tree.

f33bab4

[apr] add the license field to the vcpkg.json file.

b37ccc9

[apr] update git-tree.

fa826f0

JonLiu1993 assigned WangWeiLin-MV May 11, 2024

WangWeiLin-MV previously approved these changes May 11, 2024

View reviewed changes

WangWeiLin-MV added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label May 11, 2024

rinrab marked this pull request as ready for review May 11, 2024 09:27

WangWeiLin-MV added the info:reviewed Pull Request changes follow basic guidelines label May 13, 2024

rinrab added 3 commits May 14, 2024 20:56

[apr] generate patches per all revisions

630d30e

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" } ```

[apr] fix patch appling

f23193d

* 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.

[apr] update git-tree

abd7de0

rinrab dismissed WangWeiLin-MV’s stale review via abd7de0 May 14, 2024 19:22

WangWeiLin-MV requested changes May 15, 2024

View reviewed changes

ports/apr/portfile.cmake Outdated Show resolved Hide resolved

ports/apr/portfile.cmake Outdated Show resolved Hide resolved

rinrab added 2 commits May 15, 2024 19:12

[apr] revert accedently changed indentation in the portfile.cmake.

faa5eb2

[apr] update git-tree

eb50a78

rinrab requested a review from WangWeiLin-MV May 15, 2024 17:47

WangWeiLin-MV requested changes May 16, 2024

View reviewed changes

ports/apr/portfile.cmake Outdated Show resolved Hide resolved

ports/apr/portfile.cmake Outdated Show resolved Hide resolved

rinrab added 3 commits May 16, 2024 14:31

[apr] use the FEATURE_OPTIONS variable to pass features to the cmake …

e0e3454

…configure command.

[apr] revert setting of the MIN_WINDOWS_VER and APR_HAVE_IPV6 variables.

b1e6e05

[apr] update git-tree

a347950

data-queue removed the info:reviewed Pull Request changes follow basic guidelines label May 16, 2024

data-queue marked this pull request as draft May 16, 2024 20:32

rinrab closed this Aug 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[apr] fix CMake config via patch from the stable branch. #38674

[apr] fix CMake config via patch from the stable branch. #38674

rinrab commented May 10, 2024 •

edited

Loading

WangWeiLin-MV commented May 11, 2024 •

edited

Loading

WangWeiLin-MV left a comment •

edited

Loading

rinrab commented May 11, 2024 •

edited

Loading

WangWeiLin-MV commented May 11, 2024

rinrab commented May 14, 2024 •

edited

Loading

rinrab commented May 14, 2024

rinrab commented May 15, 2024

WangWeiLin-MV left a comment

rinrab commented May 16, 2024

data-queue commented May 16, 2024

rinrab commented Aug 31, 2024 •

edited

Loading

[apr] fix CMake config via patch from the stable branch. #38674

[apr] fix CMake config via patch from the stable branch. #38674

Conversation

rinrab commented May 10, 2024 • edited Loading

WangWeiLin-MV commented May 11, 2024 • edited Loading

WangWeiLin-MV left a comment • edited Loading

Choose a reason for hiding this comment

rinrab commented May 11, 2024 • edited Loading

WangWeiLin-MV commented May 11, 2024

rinrab commented May 14, 2024 • edited Loading

rinrab commented May 14, 2024

rinrab commented May 15, 2024

WangWeiLin-MV left a comment

Choose a reason for hiding this comment

rinrab commented May 16, 2024

data-queue commented May 16, 2024

rinrab commented Aug 31, 2024 • edited Loading

rinrab commented May 10, 2024 •

edited

Loading

WangWeiLin-MV commented May 11, 2024 •

edited

Loading

WangWeiLin-MV left a comment •

edited

Loading

rinrab commented May 11, 2024 •

edited

Loading

rinrab commented May 14, 2024 •

edited

Loading

rinrab commented Aug 31, 2024 •

edited

Loading