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

[LIBMYSQL] Fix osx build creates invalid nuget package #31134

Merged
merged 1 commit into from
May 1, 2023
Merged

[LIBMYSQL] Fix osx build creates invalid nuget package #31134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ports/libmysql/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mysql/mysql-server
REF 1bfe02bdad6604d54913c62614bde57a055c8332 # 8.0.32
SHA512 9a556b783ee978c919ccc0c1c99ab4a84ecc9fe0b75e2e100ad616f3b7c7bd280c8da63eb9e9c98291256ebbd130aef8c6e5c404e93b7cc8b8fe754b055b650f
REF mysql-${VERSION}
SHA512 1233abe4fe055f62cc28c847e77bcfc37e03e77ee68b8606e5ad722e0b6d1ae30b95bbe623a88cecdfa0b5868b61eabaf4b99e78cb6fbb9cf3627c91d17feb0e
Copy link
Contributor

Choose a reason for hiding this comment

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

The SHA512 is wrong. And why it is different if you are downloading the same release?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hm

➜  Downloads vcpkg hash mysql-server-1bfe02bdad6604d54913c62614bde57a055c8332.tar.gz 
9a556b783ee978c919ccc0c1c99ab4a84ecc9fe0b75e2e100ad616f3b7c7bd280c8da63eb9e9c98291256ebbd130aef8c6e5c404e93b7cc8b8fe754b055b650f
➜  Downloads vcpkg hash mysql-server-mysql-8.0.32.tar.gz 
8b9f15b301b158e6ffc99dd916b9062968d36f6bdd7b898636fa61badfbe68f7328d4a39fa3b8b3ebef180d3aec1aee353bd2dac9ef1594e5772291390e17ac0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Bizarre - I can confirm this is wrong, not sure how it snuck through the PR tests.
I see you fixed already - thx.

HEAD_REF master
PATCHES
ignore-boost-version.patch
Expand Down Expand Up @@ -64,6 +64,7 @@ vcpkg_cmake_configure(
BUNDLE_RUNTIME_LIBRARIES # only on windows
LINK_STATIC_RUNTIME_LIBRARIES # only on windows
WIX_DIR # only on windows
WITH_BUILD_ID # only on windows
)

vcpkg_cmake_install(ADD_BIN_TO_PATH)
Expand Down Expand Up @@ -122,11 +123,12 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/debug/man"
"${CURRENT_PACKAGES_DIR}/docs"
"${CURRENT_PACKAGES_DIR}/debug/docs"
"${CURRENT_PACKAGES_DIR}/lib/debug"
"${CURRENT_PACKAGES_DIR}/lib/plugin"
"${CURRENT_PACKAGES_DIR}/lib/plugin/debug"
"${CURRENT_PACKAGES_DIR}/debug/lib/plugin"
)

# delete dynamic dll on static build
Expand All @@ -141,7 +143,6 @@ if (BUILD_STATIC_LIBS)
"${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.lib"
"${CURRENT_PACKAGES_DIR}/lib/libmysql.pdb"
"${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb"
"${CURRENT_PACKAGES_DIR}/debug/lib/libmysql.pdb"
)
endif()

Expand Down
2 changes: 1 addition & 1 deletion ports/libmysql/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libmysql",
"version": "8.0.32",
"port-version": 1,
"port-version": 2,
"description": "A MySQL client library for C development",
"homepage": "https://github.com/mysql/mysql-server",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4246,7 +4246,7 @@
},
"libmysql": {
"baseline": "8.0.32",
"port-version": 1
"port-version": 2
},
"libnice": {
"baseline": "0.1.21",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libmysql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8c4f68caa6f20ecfc912028a0f94ef956c154410",
"version": "8.0.32",
"port-version": 2
},
{
"git-tree": "1c2161c6415adf63a68c648172ff414eef484d4e",
"version": "8.0.32",
Expand Down