public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/libressl:master commit in: dev-db/mysql-connector-c/files/
@ 2025-01-12 16:31 orbea
  0 siblings, 0 replies; only message in thread
From: orbea @ 2025-01-12 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f1e02c5f7fa97514154f3467f0018be1124a4796
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Jan 12 15:42:23 2025 +0000
Commit:     orbea <orbea <AT> riseup <DOT> net>
CommitDate: Sun Jan 12 15:42:23 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=f1e02c5f

dev-db/mysql-connector-c: drop patches

Signed-off-by: orbea <orbea <AT> riseup.net>

 ...-8.0.22-always-build-decompress-utilities.patch | 22 -------------------
 .../files/mysql-connector-c-8.0.32-musl.patch      | 25 ----------------------
 2 files changed, 47 deletions(-)

diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
deleted file mode 100644
index b0046fd..0000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.22-always-build-decompress-utilities.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/utilities/CMakeLists.txt
-+++ b/utilities/CMakeLists.txt
-@@ -123,14 +123,11 @@ MYSQL_ADD_EXECUTABLE(perror
-   DEPENDENCIES GenError
-   LINK_LIBRARIES mysys
-   )
--IF(BUILD_BUNDLED_LZ4)
--  MYSQL_ADD_EXECUTABLE(lz4_decompress
--    lz4_decompress.cc
--    COMPONENT Server
--    LINK_LIBRARIES ${LZ4_LIBRARY} mysys
--    )
--ENDIF()
--
-+MYSQL_ADD_EXECUTABLE(lz4_decompress
-+  lz4_decompress.cc
-+  COMPONENT Server
-+  LINK_LIBRARIES ${LZ4_LIBRARY} mysys
-+  )
- MYSQL_ADD_EXECUTABLE(zlib_decompress
-   zlib_decompress.cc
-   COMPONENT Server

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
deleted file mode 100644
index 252c5ee..0000000
--- a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.32-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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;


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2025-01-12 16:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-12 16:31 [gentoo-commits] repo/proj/libressl:master commit in: dev-db/mysql-connector-c/files/ orbea

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox