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

[libdjinterop] update to 0.16.0 #20136

Merged
merged 2 commits into from
Sep 22, 2021

Conversation

Be-ing
Copy link
Contributor

@Be-ing Be-ing commented Sep 13, 2021

Describe the pull request

  • What does your PR fix?

    Fixes outdated libdjinterop package

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    all

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 13, 2021

Is the sqlite3 package not installing a pkgconfig file?

Building package libdjinterop[core]:x64-linux...
-- Downloading https://github.com/xsco/libdjinterop/archive/0.16.0.tar.gz -> xsco-libdjinterop-0.16.0.tar.gz...
-- Extracting source /mnt/vcpkg-ci/downloads/xsco-libdjinterop-0.16.0.tar.gz
-- Using source at /mnt/vcpkg-ci/buildtrees/libdjinterop/src/0.16.0-c2f5fdd1ce.clean
-- Configuring x64-linux-dbg
-- Configuring x64-linux-rel
-- Building x64-linux-dbg
-- Building x64-linux-rel
-- Fixing pkgconfig file: /mnt/vcpkg-ci/packages/libdjinterop_x64-linux/lib/pkgconfig/djinterop.pc
-- pkg_cfg_cmd call with:/bin/pkg-config --exists djinterop failed
-- ENV{PKG_CONFIG_PATH}:/mnt/vcpkg-ci/installed/x64-linux/lib/pkgconfig:/mnt/vcpkg-ci/installed/x64-linux/share/pkgconfig:/mnt/vcpkg-ci/packages/libdjinterop_x64-linux/lib/pkgconfig:/mnt/vcpkg-ci/packages/libdjinterop_x64-linux/share/pkgconfig
-- pkg-config call failed with error code:1
-- pkg-config output:
CMake Error at scripts/cmake/vcpkg_fixup_pkgconfig.cmake:83 (message):
  pkg-config error output:Package sqlite3 was not found in the pkg-config
  search path.

  Perhaps you should add the directory containing `sqlite3.pc'

  to the PKG_CONFIG_PATH environment variable

  Package 'sqlite3', required by 'djinterop', not found
Call Stack (most recent call first):
  scripts/cmake/vcpkg_fixup_pkgconfig.cmake:184 (vcpkg_fixup_pkgconfig_check_files)
  ports/libdjinterop/portfile.cmake:13 (vcpkg_fixup_pkgconfig)
  scripts/ports.cmake:140 (include)

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 13, 2021

I can't reproduce the x64-linux build error locally. Why is it failing on CI?

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 13, 2021

Indeed, the sqlite3 package does not install a pkgconfig file. I suppose it worked locally on x64-linux because it picked up my system sqlite3 pkgconfig file.

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 13, 2021

The sqlite3 port builds from the SQLite "amalgamation" source which does not include a pkgconfig file like the SQLite autotools source.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout c26477297ce1a9d67844e86bf0cda0e7741bd169 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 1a115f3..9143da5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6166,7 +6166,7 @@
     },
     "sqlite3": {
       "baseline": "3.36.0",
-      "port-version": 0
+      "port-version": 1
     },
     "sqlitecpp": {
       "baseline": "3.1.1",
diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json
index 2154ae8..4e64d95 100644
--- a/versions/s-/sqlite3.json
+++ b/versions/s-/sqlite3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "49efb0a409bd7f57c153b182514c548256c1d62a",
+      "version": "3.36.0",
+      "port-version": 1
+    },
     {
       "git-tree": "c23525b0204e11a56d40cbb0b7fa68861450df04",
       "version": "3.36.0",

Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

Nice to add sqlite3 pc file.

ports/sqlite3/sqlite3.pc.in Outdated Show resolved Hide resolved
@JonLiu1993 JonLiu1993 self-assigned this Sep 14, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Sep 14, 2021
@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 14, 2021

@dg0yt could you take another look at how the sqlite3 pkgconfig file is handled now?

@JonLiu1993
Copy link
Member

JonLiu1993 commented Sep 15, 2021

@Be-ing ,I installed sqlite3 locally, and the .pc file should be generated under the ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ folder instead of under the ${CURRENT_PACKAGES_DIR}/share/pkgconfig file. Could you modify the path?

Copy link
Contributor

@dg0yt dg0yt left a comment

Choose a reason for hiding this comment

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

I would prefer to remove all references to zlib unless properly used in an optional feature.

ports/sqlite3/sqlite3.pc.in Outdated Show resolved Hide resolved
ports/sqlite3/portfile.cmake Outdated Show resolved Hide resolved
ports/sqlite3/portfile.cmake Outdated Show resolved Hide resolved
ports/sqlite3/portfile.cmake Outdated Show resolved Hide resolved
@BillyONeal
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JonLiu1993
Copy link
Member

@Be-ing ,Could you please take a look?
install-x64-osx-dbg-err.log
install-x64-osx-dbg-out.log

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 16, 2021

install: mkdir /Users/vagrant/Data/packages/python3_x64-osx/Users/vagrant/Data/installed/x64-osx/debug/lib: File exists
make: *** [altbininstall] Error 71

I don't think this is related to the changes in this branch??

@BillyONeal
Copy link
Member

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@BillyONeal
Copy link
Member

I'm sorry it seems like our CI has been unhappy today. Having an issue where sometimes bazel building tensorflow breaks out of our job and causes that build node to fail a bunch of things after. I have not seen the specific macos issue reported here before, but python3 is not in libdjinterop 's cone of destruction so I've simply requeued the build.

@Be-ing
Copy link
Contributor Author

Be-ing commented Sep 17, 2021

CI passed now.

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Sep 18, 2021
ports/sqlite3/CMakeLists.txt Outdated Show resolved Hide resolved
@JonLiu1993 JonLiu1993 added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Sep 18, 2021
Linux distributions typically use the SQLite autoconf package,
but this port uses the SQLite amalgamation package with a custom
CMakeLists.txt so the port needs to take care of installing the
pkgconfig file.
@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Sep 22, 2021
@strega-nil-ms
Copy link
Contributor

Thanks @Be-ing!

@strega-nil-ms strega-nil-ms merged commit 93885af into microsoft:master Sep 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

5 participants