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.

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

[sqlite3] Fix tool installation with zlib #31050

Merged
merged 3 commits into from
Apr 26, 2023
Merged

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Apr 22, 2023

Fixes missing zlib DLL. (Cf. #31040.)

This PR intentionally doesn't change the location of the tool at this point, to not break consumers.

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

@jimwang118 jimwang118 added the category:port-bug The issue is with a library, which is something the port should already support label Apr 23, 2023
@rcoup
Copy link
Contributor

rcoup commented Apr 23, 2023

@dg0yt to fix #31040, presumably Proj still needs to change along these lines?

diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake
index 2e280823b..a28bd0851 100644
--- a/ports/proj/portfile.cmake
+++ b/ports/proj/portfile.cmake
@@ -24,7 +24,7 @@ if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES)
     vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync)
 endif()

-find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED)
+find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/bin" NO_DEFAULT_PATH REQUIRED)

 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

@dg0yt
Copy link
Contributor Author

dg0yt commented Apr 25, 2023

@dg0yt to fix #31040, presumably Proj still needs to change along these lines?

diff --git a/ports/proj/portfile.cmake b/ports/proj/portfile.cmake
index 2e280823b..a28bd0851 100644
--- a/ports/proj/portfile.cmake
+++ b/ports/proj/portfile.cmake
@@ -24,7 +24,7 @@ if("tools" IN_LIST FEATURES AND NOT "net" IN_LIST FEATURES)
     vcpkg_list(REMOVE_ITEM TOOL_NAMES projsync)
 endif()

-find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH REQUIRED)
+find_program(EXE_SQLITE3 NAMES "sqlite3" PATHS "${CURRENT_HOST_INSTALLED_DIR}/bin" NO_DEFAULT_PATH REQUIRED)

 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

No. vcpkg_copy_tools moves the program.

@dg0yt dg0yt marked this pull request as draft April 25, 2023 05:04
@dg0yt dg0yt marked this pull request as ready for review April 25, 2023 05:15
@dg0yt
Copy link
Contributor Author

dg0yt commented Apr 25, 2023

Hooray, this the first regular PR build getting CI builds for android! ❤️ even if it would add regressions.

@BillyONeal BillyONeal merged commit d18847f into microsoft:master Apr 26, 2023
@BillyONeal
Copy link
Member

Thanks for the fix!

@jimwang118 jimwang118 added the info:reviewed Pull Request changes follow basic guidelines label Apr 26, 2023
@dg0yt dg0yt deleted the sqlite3 branch April 26, 2023 06:17
@daschuer daschuer mentioned this pull request Jun 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants