Skip to content

[apr apr-util] Apr and apr-util for non windows systems#8579

Merged
strega-nil merged 22 commits intomicrosoft:masterfrom
stephen-webb:apr-for-non-windows-systems
May 6, 2020
Merged

[apr apr-util] Apr and apr-util for non windows systems#8579
strega-nil merged 22 commits intomicrosoft:masterfrom
stephen-webb:apr-for-non-windows-systems

Conversation

@stephen-webb
Copy link
Contributor

@stephen-webb stephen-webb commented Oct 13, 2019

The apr and apr-util CMakeLists.txt is Windows only

@msftclas
Copy link

msftclas commented Oct 13, 2019 •
edited
Loading

CLA assistant check
All CLA requirements met.

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Oct 13, 2019

This PR may address issue #6571 and is a prerequisite for issue #6125

@JackBoosY
Copy link
Contributor

JackBoosY commented Nov 19, 2019

/azp run

@stephen-webb stephen-webb mentioned this pull request Jan 6, 2020
Closed
@PhoebeHui PhoebeHui self-assigned this Jan 14, 2020
@PhoebeHui PhoebeHui changed the title Apr and apr-util for non windows systems [apr apr-util] Apr and apr-util for non windows systems Jan 15, 2020
PhoebeHui
PhoebeHui requested changes Jan 16, 2020
View reviewed changes
@JackBoosY
Copy link
Contributor

JackBoosY commented Jan 19, 2020

Needs to rerun test after #9752 merged.

PhoebeHui
PhoebeHui requested changes Jan 20, 2020
View reviewed changes
@PhoebeHui
Copy link
Contributor

PhoebeHui commented Jan 23, 2020

@stephen-webb, thanks for updates!

The CI test failed on windows, linux and OSX, could you take a look?

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Jan 24, 2020

The CI fails because apr-util-unix is being built by the Windows systems and apr-util-windows is being built by the Linux and OSX systems.

I have moved apr-util-unix and apr-util-windows back into apr-util and used a conditional inside ports.cmake

JackBoosY
JackBoosY suggested changes Feb 1, 2020
View reviewed changes
@stephen-webb
Copy link
Contributor Author

stephen-webb commented Feb 11, 2020

Most CI build failures are due to openMAMA failing. APR and APR-UTIL builds succeeded except x64-windows-static which reported:
2020-02-11T03:52:38.2175510Z -- Downloading https://www.apache.org/dist/apr/apr-1.7.0.tar.bz2...
2020-02-11T03:53:08.7265036Z -- Downloading https://www.apache.org/dist/apr/apr-1.7.0.tar.bz2... Failed. Status: 35;"SSL connect error"

The failure must be network related as x86-windows did not have a download issue. It reported:
2020-02-11T03:51:55.7940655Z -- Downloading https://www.apache.org/dist/apr/apr-1.7.0.tar.bz2...
2020-02-11T03:52:22.9621198Z -- Extracting source C:/vsts/_work/3/s/downloads/apr-1.7.0.tar.bz2

@JackBoosY
Copy link
Contributor

JackBoosY commented Feb 13, 2020

@stephen-webb I also cannot use this link to download the source code on my machine. Can you replace the source url?

@JackBoosY
Copy link
Contributor

JackBoosY commented Feb 13, 2020

/azp run

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Feb 13, 2020

Which link do you think needs to be changed?
Note: All links are the official release archives.

@JackBoosY
Copy link
Contributor

JackBoosY commented Feb 14, 2020

@stephen-webb Forgot it. I will restart ci test after #10051 merged.

@JackBoosY
Copy link
Contributor

JackBoosY commented Feb 20, 2020

/azp run

@JackBoosY
Copy link
Contributor

JackBoosY commented Feb 20, 2020

Seems have build failures, can you resolve them?

Thanks.

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Mar 7, 2020

The failure do not relate to my changes - they are from other ports.

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Mar 7, 2020

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented Mar 7, 2020

Commenter does not have sufficient privileges for PR 8579 in repo microsoft/vcpkg

@JackBoosY
Copy link
Contributor

JackBoosY commented Mar 9, 2020

/azp run

@JackBoosY
Copy link
Contributor

JackBoosY commented Mar 10, 2020

Still have some regressions.

@stephen-webb
Copy link
Contributor Author

stephen-webb commented Mar 10, 2020 •
edited
Loading

Once again, the failures are in other ports! activemq-cpp, aliyun-oss-c-sd, openmama

These ports need to be excluded from linux and osx until they have an implementation for these platforms.

Too many ports in vcpkg are Windows only. I guess I have to use conan.io (despite my preference for a cmake/C++ based package manager).

@JackBoosY
Copy link
Contributor

JackBoosY commented Mar 10, 2020

@stephen-webb Sorry, I forgot that.
Please remove apr:x64-linux=fail and apr:x64-osx=fail, and add the following code to
VCPKG_PATH/scripts/ci.baseline.txt:

activemq-cpp:x64-linux=fail
activemq-cpp:x64-osx=fail
aliyun-oss-c-sdk:x64-linux=fail
aliyun-oss-c-sdk:x64-osx=fail
openmama:x64-linux=fail
openmama:x64-osx=fail

Thanks.

stephen-webb added 22 commits May 1, 2020 11:21
@stephen-webb @strega-nil
Allow the apr port to be used on non-windows systems
872d47d
@stephen-webb @strega-nil
Allow the apr-util port to be used on non-windows systems
c02462e
@stephen-webb @strega-nil
Allow the apr-util port to be used on non-windows systems
0892bf4
@stephen-webb @strega-nil
[log4cxx] add new port
e8c2a27
@stephen-webb @strega-nil
Allow the apr-util port to be used on non-windows systems
1e2d5e8
@stephen-webb @strega-nil
Add aarch64 cross compilation support
4cafd4c
@stephen-webb @strega-nil
Allow apr and apr-util ports to used with a cross compiling tool chain
fd7fa07
@stephen-webb @strega-nil
@PhoebeHui requested changes
44d40ff
@stephen-webb @strega-nil
Remove files that leaked from 'add-log4cxx-port' branch
3a07ab7
@stephen-webb @strega-nil
@PhoebeHui requested changes
c8e3dfe
@stephen-webb @strega-nil
Move apr-util-unix and apr-util-windows portfile.cmake content back i…
ad6fe27 
…nto apr-util/portfile.cmake
@stephen-webb @strega-nil
Use the same released archive for unix and windows
860d494
@stephen-webb @strega-nil
Use the same released archive for unix and windows (1.6.1)
eb9cb43
@stephen-webb @strega-nil
Update APR version to the latest
f19e564
@stephen-webb @strega-nil
Prevent unrelated CI failures
42d0dae
@stephen-webb @strega-nil
Prevent CI failure for arm64 on x86 CI machine
27a614e
@stephen-webb @strega-nil
Prevent CI failure for arm64 on x86 CI machine
23420f8
@stephen-webb @strega-nil
Use vcpkg_configure_make and vcpkg_install_make instead of vcpkg_exec…
334e5e4 
…ute_required_process
@stephen-webb @strega-nil
Remove shared libraries if a static build
37c92c0
@stephen-webb @strega-nil
Revert "Remove shared libraries if a static build"
b826a5c 
This reverts commit 540e158.
@stephen-webb @strega-nil
Prevent CI failures due to static build installing apr-1-config into bin
bcdda39
@stephen-webb @strega-nil
@PhoebeHui requested changes
2b6f6a8
@strega-nil strega-nil force-pushed the apr-for-non-windows-systems branch from 34f825d to 2b6f6a8 Compare May 1, 2020 18:22
@JackBoosY
Copy link
Contributor

JackBoosY commented May 6, 2020 •
edited
Loading

LGTM.
@strega-nil Ready to merge now.

@strega-nil
Copy link
Contributor

strega-nil commented May 6, 2020

/azp run

@azure-pipelines
Copy link

azure-pipelines bot commented May 6, 2020

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil
Copy link
Contributor

strega-nil commented May 6, 2020

Alright, let's merge!

@strega-nil strega-nil merged commit 9614c6a into microsoft:master May 6, 2020
@stephen-webb stephen-webb deleted the apr-for-non-windows-systems branch May 6, 2020 23:19
@NancyLi1013 NancyLi1013 mentioned this pull request Jul 20, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PhoebeHui PhoebeHui PhoebeHui approved these changes

+1 more reviewer

@JackBoosY JackBoosY JackBoosY approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@PhoebeHui PhoebeHui

@grdowns grdowns

@JackBoosY JackBoosY

Labels

info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@stephen-webb @msftclas @JackBoosY @PhoebeHui @ras0219-msft @strega-nil @grdowns