diff options
| author |   orbea <orbea@riseup.net> | 2023-04-07 12:55:08 -0700 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-04-09 06:27:14 +0100 |
| commit | 016648eda578932e93becd587cbc9bc4e376c9e3 (patch) | |
| tree | fc59a6b84235feb61d7f3b8a6dc7b57f1d6a4dc5 /dev-db | |
| parent | net-libs/webkit-gtk: handle more RUBY_EXECUTABLE cases (diff) | |
| download | gentoo-016648eda578932e93becd587cbc9bc4e376c9e3.tar.gz gentoo-016648eda578932e93becd587cbc9bc4e376c9e3.tar.bz2 gentoo-016648eda578932e93becd587cbc9bc4e376c9e3.zip | |
dev-db/mysql-connector-c: Build fixes
* Adds -DWITH_BUILD_ID=OFF to workaround various build issues
* Patches the source to work with musl
Upstream-PR: https://github.com/mysql/mysql-server/pull/455
Closes: https://bugs.gentoo.org/886474
Closes: https://bugs.gentoo.org/903415
Closes: https://bugs.gentoo.org/885035
Signed-off-by: orbea <orbea@riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/30517
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch | 25 | ||||
| -rw-r--r-- | dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch new file mode 100644 index 000000000000..252c5eeda32e --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch @@ -0,0 +1,25 @@ +https://github.com/mysql/mysql-server/pull/454 + +From c875f049cb3571da1b9b5bcae50caccc5ee47cfb Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 7 Apr 2023 12:47:51 -0700 +Subject: [PATCH] sql/memory: Fix the musl build + +_SC_LEVEL1_DCACHE_LINESIZE is not specific to linux, but to glibc. +--- + sql/memory/aligned_atomic.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sql/memory/aligned_atomic.h b/sql/memory/aligned_atomic.h +index d13d45b9deea..bd19c0cf4d6f 100644 +--- a/sql/memory/aligned_atomic.h ++++ b/sql/memory/aligned_atomic.h +@@ -76,7 +76,7 @@ static inline size_t _cache_line_size() { + return line_size; + } + +-#elif defined(__linux__) ++#elif defined(__GLIBC__) + static inline size_t _cache_line_size() { + long size = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); + if (size == -1) return 64; diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild index 57568257e26e..59782a42d7ae 100644 --- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild @@ -51,6 +51,7 @@ PATCHES=( "${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch "${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch "${FILESDIR}"/${PN}-8.0.27-res_n.patch + "${FILESDIR}"/${PN}-8.0.32-musl.patch ) src_prepare() { @@ -103,6 +104,7 @@ multilib_src_configure() { -DSHARED_LIB_PATCH_VERSION="0" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITHOUT_SERVER=ON + -DWITH_BUILD_ID=OFF ) cmake_src_configure |