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

[drogon] Update to 1.7.5 #23227

Merged
merged 1 commit into from
Feb 23, 2022
Merged

[drogon] Update to 1.7.5 #23227

merged 1 commit into from
Feb 23, 2022

Conversation

an-tao
Copy link
Contributor

@an-tao an-tao commented Feb 22, 2022

No description provided.

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 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/baseline.json b/versions/baseline.json
index 7d82610..f732d2c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1914,7 +1914,7 @@
     },
     "drogon": {
       "baseline": "1.7.5",
-      "port-version": 0
+      "port-version": 2
     },
     "dtl": {
       "baseline": "1.19",
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index f801d8d..8e82e4a 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -3,7 +3,7 @@
     {
       "git-tree": "dc133ea44f319f9a9d953cc2d26823b2d3eb96bf",
       "version-semver": "1.7.5",
-      "port-version": 0 
+      "port-version": 2
     },
     {
       "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",

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!

All manifest files must be formatted

./vcpkg format-manifest ports/*/vcpkg.json

Diff
diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json
index 52fa1d9..f6e70f7 100644
--- a/ports/drogon/vcpkg.json
+++ b/ports/drogon/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "drogon",
   "version-semver": "1.7.5",
-  "port-version": 0,
   "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows",
   "homepage": "https://github.com/an-tao/drogon",
   "documentation": "https://drogon.docsforge.com/master/overview/",
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 5cf60186a241e84e8232641ee973395d4fde90e1 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json
index 089d44c..7e0e9d9 100644
--- a/versions/d-/drogon.json
+++ b/versions/d-/drogon.json
@@ -1,9 +1,9 @@
 {
   "versions": [
     {
-      "git-tree": "09f089fde4ce6145744e0c164031464c39f0ad35",
+      "git-tree": "a66c2bb4632ab86589f1cabed26607d510ae2eba",
       "version-semver": "1.7.5",
-      "port-version": 0 
+      "port-version": 0
     },
     {
       "git-tree": "b7be1868461c479ff45609e892bc5de9adf42258",

@JonLiu1993 JonLiu1993 self-assigned this Feb 23, 2022
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Feb 23, 2022
@JonLiu1993
Copy link
Member

All features are tested successfully in the following triplet:

  • x86-windows
  • x64-windows
  • x64-windows-static

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 23, 2022
@vicroms vicroms merged commit f3a6822 into microsoft:master Feb 23, 2022
@an-tao an-tao deleted the drogon branch February 24, 2022 03:50
ekilmer added a commit to ekilmer/vcpkg that referenced this pull request Feb 27, 2022
* master: (57 commits)
  [vcpkg-tools] update cmake and git (windows only) (microsoft#22985)
  Update vcpkg tool to 2022-02-24. (microsoft#23162)
  [vcpkg baseline] Move cspice headers (microsoft#23272)
  Fixed inaccurate Chinese words (microsoft#23179)
  [vcpkg] Add fixed changelog generator. (microsoft#23255)
  [authentication.md] Add Jenkins section (microsoft#23226)
  [vcpkg] Meson osx sysroot (microsoft#21772)
  [pkgconf] enable search for system libs on linux (microsoft#23010)
  [yasm/yasm-tool] Incorporate yasm-tool into yasm (microsoft#23218)
  [lapack-reference] Update to 3.10 (microsoft#23228)
  [skia] Arm64 for skia on osx (microsoft#23222)
  [libfido2] Update to 1.10.0 (microsoft#23241)
  [Tracy] Fixing issue where version 0.7.8 was pulling the wrong version (microsoft#23061)
  [libgpiod] Add new port. (microsoft#23221)
  [drogon] Update to 1.7.5 (microsoft#23227)
  [tinyexif] Remove from fail list. (microsoft#23163)
  [vcpkg docs][ES] Sync with English readme (microsoft#19834) (microsoft#22618)
  [vcpkg baseline][libao] Disable dlfcn check under windows (microsoft#23235)
  [OpenCV] upgrade to v4.5.5 (microsoft#22801)
  [libcurl-simple-https] New port (microsoft#22917)
  ...
@kotori2
Copy link
Contributor

kotori2 commented Mar 22, 2022

This PR breaks Drogon linking on Linux.

cmake -DCMAKE_TOOLCHAIN_FILE=/home/kotori/vcpkg/scripts/buildsystems/vcpkg.cmake ..
-- Running vcpkg install
-- Running vcpkg install - done
-- Found Jsoncpp: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/include  
-- jsoncpp verson:1.9.5
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD
-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Failed
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE  
-- Found OpenSSL: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/lib/libcrypto.a (found version "1.1.1n")  
-- Found c-ares: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/include  
-- Found UUID: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/lib/libuuid.a
-- Found ZLIB: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/lib/libz.a (found version "1.2.11") 
-- Found SQLite3: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/lib/libsqlite3.a  
-- Found Brotli: /home/kotori/untitled2/build/vcpkg_installed/x64-linux/lib/libbrotlidec-static.a  
-- Looking for C++ include filesystem
-- Looking for C++ include filesystem - found
-- Performing Test CXX_FILESYSTEM_NO_LINK_NEEDED
-- Performing Test CXX_FILESYSTEM_NO_LINK_NEEDED - Success
-- Configuring done
CMake Error at /home/kotori/vcpkg/scripts/buildsystems/vcpkg.cmake:557 (_add_executable):
  Target "untitled2" links to target "unofficial::libmariadb" but the target
  was not found.  Perhaps a find_package() call is missing for an IMPORTED
  target, or an ALIAS target is missing?
Call Stack (most recent call first):
  CMakeLists.txt:6 (add_executable)


-- Generating done
CMake Generate step failed.  Build files cannot be regenerated correctly.

CMakeLists.txt

cmake_minimum_required(VERSION 3.16.3)
project(untitled2)

set(CMAKE_CXX_STANDARD 20)
find_package(Drogon CONFIG REQUIRED)
add_executable(untitled2 main.cpp)
target_link_libraries(untitled2 Drogon::Drogon)

@an-tao
Copy link
Contributor Author

an-tao commented Mar 22, 2022

did you upgrade the dependencies of drogon in vcpkg?

@kotori2
Copy link
Contributor

kotori2 commented Mar 22, 2022

did you upgrade the dependencies of drogon in vcpkg?

Yes.

$ cat ../vcpkg.json 
{
  "name": "test",
  "version-string": "0.1",
  "port-version": 1,
  "homepage": "",
  "description": "",
  "dependencies": [
    {
      "name": "drogon",
      "features": [ "ctl", "mysql", "sqlite3" ]
    }
  ],
  "builtin-baseline": "f3a68220a5b48132e53708ed76411f04976a911a"
}

982cf2b (previous commit) works without any issue.

@dg0yt
Copy link
Contributor

dg0yt commented Mar 22, 2022

IIUC we lack the initialization of MySQL_FOUND now. That's why the find_dependency(unofficial-libmariadb) isn't called in the exported config.

In the context of GDAL, I learned to appreciate the extended signature of find_package. If a project needs a MySQL_FOUND, a patch could use find_package(MySQL NAMES unofficial-mariadb). This would allow smaller patches with less side effects.

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