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

[getdns] update to 1.7.3 #34188

Merged
merged 7 commits into from
Dec 14, 2023
Merged

[getdns] update to 1.7.3 #34188

merged 7 commits into from
Dec 14, 2023

Conversation

jiayuehua
Copy link
Contributor

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@jiayuehua jiayuehua closed this Oct 1, 2023
@jiayuehua jiayuehua deleted the getdns branch October 1, 2023 12:47
@dg0yt
Copy link
Contributor

dg0yt commented Oct 2, 2023

FTR:

D:\buildtrees\getdns\src\getdns-1-9f99f372dc.clean\src\gldns\parseutil.c(17): fatal error C1083: Cannot open include file: 'sys/time.h': No such file or directory
D:\buildtrees\getdns\src\getdns-1-9f99f372dc.clean\src\gldns\parse.c(16): fatal error C1083: Cannot open include file: 'strings.h': No such file or directory

@jiayuehua jiayuehua restored the getdns branch October 3, 2023 09:21
@jiayuehua jiayuehua reopened this Oct 3, 2023
@jiayuehua
Copy link
Contributor Author

@dg0yt I can't see the error message in CI. Thanks for your hint.

@dg0yt
Copy link
Contributor

dg0yt commented Oct 3, 2023

@dg0yt I can't see the error message in CI. Thanks for your hint.

You can.
#31357

@jiayuehua
Copy link
Contributor Author

I know that. But likely this port error message is very simple.

BillyONeal
BillyONeal reviewed Oct 4, 2023
View reviewed changes
ports/getdns/fix-include.patch

#include "config.h"
#include "gldns/parseutil.h"
+#ifdef HAVE_SYS_TIME_H
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would like to see what happens with getdnsapi/getdns#538 before proceeding here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, upstream has had a couple months to respond and they have not so I think you can proceed but please evaluate just taking that patch submitted upstream.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getdnsapi/getdns#543

@BillyONeal BillyONeal added the depends:upstream-changes Waiting on a change to the upstream project label Oct 4, 2023
@BillyONeal BillyONeal mentioned this pull request Oct 4, 2023
Open
BillyONeal
BillyONeal reviewed Oct 4, 2023
View reviewed changes
ports/getdns/disable-docs.patch Outdated
message(WARNING "Test programs require libcheck and so do not build on Windows, skipping.")
else ()
find_package(Check "0.9.6" REQUIRED)
- set(GETDNS_TEST_SOURCE_FILES
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be removable from the patch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just has removed

@MonicaLiu0311 MonicaLiu0311 added category:port-update The issue is with a library, which is requesting update new revision and removed depends:upstream-changes Waiting on a change to the upstream project labels Nov 29, 2023
@jiayuehua jiayuehua mentioned this pull request Nov 30, 2023
Closed
@MonicaLiu0311
Copy link
Contributor

The following error occurred when I tested feature libuv:

-- Configuring x64-windows-dbg
CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:112 (message):
    Command failed: "C:/Program Files/CMake/bin/cmake.exe" G:/getdns/buildtrees/getdns/src/getdns-1-6cf4cc7bfb.clean -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=G:/getdns/packages/getdns_x64-windows/debug -DFETCHCONTENT_FULLY_DISCONNECTED=ON -DBUILD_GETDNS_QUERY=OFF -DBUILD_GETDNS_SERVER_MON=OFF -DENABLE_STATIC=0 -DENABLE_SHARED=1 -DBUILD_LIBEVENT2=ON -DBUILD_LIBUV=ON -DBUILD_TESTING=OFF -DENABLE_STUB_ONLY=ON "-DCMAKE_MAKE_PROGRAM=C:/Program Files/Microsoft Visual Studio/2022/Enterprise/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe" -DBUILD_SHARED_LIBS=ON -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=G:/getdns/scripts/toolchains/windows.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DVCPKG_SET_CHARSET_FLAG=ON -DVCPKG_PLATFORM_TOOLSET=v143 -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=ON -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE -DCMAKE_VERBOSE_MAKEFILE=ON -DVCPKG_APPLOCAL_DEPS=OFF -DCMAKE_TOOLCHAIN_FILE=G:/getdns/scripts/buildsystems/vcpkg.cmake -DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON "-DVCPKG_CXX_FLAGS=/D_CRT_DECLARE_NONSTDC_NAMES " -DVCPKG_CXX_FLAGS_RELEASE= -DVCPKG_CXX_FLAGS_DEBUG= "-DVCPKG_C_FLAGS=/D_CRT_DECLARE_NONSTDC_NAMES " -DVCPKG_C_FLAGS_RELEASE= -DVCPKG_C_FLAGS_DEBUG= -DVCPKG_CRT_LINKAGE=dynamic -DVCPKG_LINKER_FLAGS= -DVCPKG_LINKER_FLAGS_RELEASE= -DVCPKG_LINKER_FLAGS_DEBUG= -DVCPKG_TARGET_ARCHITECTURE=x64 -DCMAKE_INSTALL_LIBDIR:STRING=lib -DCMAKE_INSTALL_BINDIR:STRING=bin -D_VCPKG_ROOT_DIR=G:/getdns -D_VCPKG_INSTALLED_DIR=G:/getdns/installed -DVCPKG_MANIFEST_INSTALL=OFF
    Working Directory: G:/getdns/buildtrees/getdns/x64-windows-dbg
    Error code: 1
    See logs for more information:
      G:\getdns\buildtrees\getdns\config-x64-windows-dbg-CMakeCache.txt.log
      G:\getdns\buildtrees\getdns\config-x64-windows-dbg-out.log
      G:\getdns\buildtrees\getdns\config-x64-windows-dbg-err.log

Call Stack (most recent call first):
  installed/x64-windows/share/vcpkg-cmake/vcpkg_cmake_configure.cmake:267 (vcpkg_execute_required_process)
  ports/getdns/portfile.cmake:30 (vcpkg_cmake_configure)
  scripts/ports.cmake:147 (include)

G:\getdns\buildtrees\getdns\config-x64-windows-dbg-err.log:

CMake Error at CMakeLists.txt:907 (target_link_libraries):
  Target "getdns_ext_uv_shared" links to:

    Libuv::Libuv

  but the target was not found.  Possible reasons include:

    * There is a typo in the target name.
    * A find_package call is missing for an IMPORTED target.
    * An ALIAS target is missing.

@MonicaLiu0311 MonicaLiu0311 marked this pull request as draft December 1, 2023 06:46
@jiayuehua
Copy link
Contributor Author

@MonicaLiu0311 please try again, although I can't reproduce the libuv issue localy on x64-windows

@MonicaLiu0311
Copy link
Contributor

All features are tested successfully in the following triplet:

x86-windows
x64-windows
x64-windows-static

@MonicaLiu0311
Copy link
Contributor

If you're ready, please revert to "Ready for review".

@jiayuehua jiayuehua marked this pull request as ready for review December 5, 2023 17:39
@jiayuehua
Copy link
Contributor Author

jiayuehua commented Dec 13, 2023 •
edited
Loading

@MonicaLiu0311 would you please review this PR?

@MonicaLiu0311 MonicaLiu0311 added the info:reviewed Pull Request changes follow basic guidelines label Dec 14, 2023
@vicroms vicroms merged commit 7077a44 into microsoft:master Dec 14, 2023
15 checks passed
@jiayuehua jiayuehua deleted the getdns branch December 14, 2023 20:40
Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024
@jiayuehua @MonicaLiu0311 @Osyotr
[getdns] update to 1.7.3 (microsoft#34188)
f9619f5 
* [getdns] update to 1.7.3

* [getdns] update to 1.7.3

* fix deps

* delete nouse patch chunk

* fix deps

* fix deps

---------

Co-authored-by: MonicaLiu <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BillyONeal BillyONeal BillyONeal left review comments

@MonicaLiu0311 MonicaLiu0311 MonicaLiu0311 approved these changes

Assignees

@MonicaLiu0311 MonicaLiu0311

Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jiayuehua @dg0yt @MonicaLiu0311 @BillyONeal @vicroms