-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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.
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
[curl] Add feature idn2 #14807
[curl] Add feature idn2 #14807
Conversation
Hi JackBoosY! I see that this pull request is still a work in progress. Do you have an ETA for when it's going to be ready? Right now the port
is an ugly (or more precisely, an incorrect) but effective way to make |
Hi @klalumiere, it should be fixed on my latest commit, can you test it? |
Also, @martti-cloudkey can you please test this PR? Thanks. |
The problem with -- Installing: /home/klalumiere/Downloads/vcpkg/packages/curl_x64-linux/share/curl/curl-config
-- Fixing pkgconfig file: /home/klalumiere/Downloads/vcpkg/packages/curl_x64-linux/lib/pkgconfig/libcurl.pc
-- CHECK_LIB_ldap_RELEASE:CHECK_LIB_ldap_RELEASE-NOTFOUND
CMake Error at scripts/cmake/vcpkg_fixup_pkgconfig.cmake:233 (message):
Library "ldap" was not found! If it is a system library use the
SYSTEM_LIBRARIES parameter for the vcpkg_fixup_pkgconfig call! Otherwise,
correct the *.pc file
Call Stack (most recent call first):
scripts/cmake/vcpkg_fixup_pkgconfig.cmake:299 (vcpkg_fixup_pkgconfig_check_files)
ports/curl/portfile.cmake:187 (vcpkg_fixup_pkgconfig)
scripts/ports.cmake:136 (include)
Error: Building package curl:x64-linux failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with `./vcpkg update`, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
Package: curl:x64-linux
Vcpkg version: 2020.11.12-unknownhash
Additionally, attach any relevant sections from the log files above.
[21:04:48] klalumiere@WKS-000791:~/Downloads/vcpkg$ git status
On branch dev/jack/14798
Your branch is up to date with 'origin/dev/jack/14798'.
nothing to commit, working tree clean |
@KaibaLopez Can you just modify VCPKG_ROOT/port/curl/portfile.cmake line 71:
And try again (do not use my changes)? Thanks. |
@klalumiere Any feedback with my comment? |
I had exactly the same problem with |
@klalumiere Yep, my mistake. It should be |
@klalumiere Can you remove Thanks. We cannot simply disable ldap because it is indeed enabled and used as a default feature on some machines. |
So as you (maybe) saw on #14865, I'm not able to reproduce the problem I had anymore on master. However, I still have problem with the branch apt-get update && apt-get install vim --no-install-recommends and that's all. Without any changes to the branch, I ran set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic) # This changed from static to dynamic
set(VCPKG_CMAKE_SYSTEM_NAME Linux) It fails, with the output CMake Error at scripts/cmake/vcpkg_fixup_pkgconfig.cmake:235 (message):
Unhandled string
"/root/vcpkg/packages/curl_x64-linux-dynamic/lib/pkgconfig/../../lib/libssl.so
/root/vcpkg/packages/curl_x64-linux-dynamic/lib/pkgconfig/../../lib/libcrypto.so
/root/vcpkg/packages/curl_x64-linux-dynamic/lib/pkgconfig/../../lib/libz.so"
was found! If it is a system library use the SYSTEM_LIBRARIES parameter for
the vcpkg_fixup_pkgconfig call! Otherwise, correct the *.pc file or add the
case to vcpkg_fixup_pkgconfig
Call Stack (most recent call first):
scripts/cmake/vcpkg_fixup_pkgconfig.cmake:299 (vcpkg_fixup_pkgconfig_check_files)
ports/curl/portfile.cmake:188 (vcpkg_fixup_pkgconfig)
scripts/ports.cmake:136 (include)
Error: Building package curl:x64-linux-dynamic failed with: BUILD_FAILED
Please ensure you're using the latest portfiles with `./vcpkg update`, then
submit an issue at https://github.com/Microsoft/vcpkg/issues including:
Package: curl:x64-linux-dynamic
Vcpkg version: 2020.11.12-unknownhash
Additionally, attach any relevant sections from the log files above. I'll try removing |
Actually... Shouldn't the string vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.a" "-lssl") There should also be vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/libssl.so" "-lssl") Couldn't we use a regular expression instead? Something in the spirit of vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc "${CURRENT_INSTALLED_DIR}/debug/lib/lib(.*)\\.so" "-l\1") |
We could add a function function(vcpkg_replace_string_regex filename match_string replace_string)
file(READ ${filename} _contents)
string(REGEX REPLACE "${match_string}" "${replace_string}" _contents "${_contents}")
file(WRITE ${filename} "${_contents}")
endfunction() and then use it as I was suggesting, but without my mistake 😆 vcpkg_replace_string_regex(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc
"${CURRENT_INSTALLED_DIR}/debug/lib/lib(.*)\.so" "-l\\1") |
I had practically the same error than here without |
cc @ras0219 for review this PR. I'm not sure my changes is correct. |
Merging The systematic warning when we build on a system different than Windows is a bit unfortunate. 🙁 . Could this warning instead be added to cURL's |
@klalumiere Adding the message to |
I'm not sure I understand. Right now the warning is inside the It also works on my machine (Ubuntu 20.04). |
@klalumiere Normally, the warning message like that always put into |
I retried to install Good point about the error logs instead of error message. I think the way spdk does it is smart, i.e. it uses |
@JackBoosY Why is this "requires:discussion"? It looks like a normal bugfix to me? |
@BillyONeal Discussion for feature |
Thanks for fixing phantom dependencies!
Fixes #14798.
Note: already test all features on
x86-windows
andx64-windows-static
successfully.