summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-22 21:38:53 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-22 21:45:26 +0200
commit93dc56e0b40fe411ad82b3990f85bd5adf562dad (patch)
tree7d7ebbaa7f33fdf1e2a9c74129c8e10d3f580fd4 /dev-db/mysql-connector-c/files
parentdev-db/mysql: migrate to GLEP 81 (diff)
downloadgentoo-93dc56e0b40fe411ad82b3990f85bd5adf562dad.tar.gz
gentoo-93dc56e0b40fe411ad82b3990f85bd5adf562dad.tar.bz2
gentoo-93dc56e0b40fe411ad82b3990f85bd5adf562dad.zip
dev-db/mysql-connector-c: rev bump
- Always install {lz4,zlib}_decompress - Avoid file collisions Closes: https://bugs.gentoo.org/692580 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'dev-db/mysql-connector-c/files')
-rw-r--r--dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
new file mode 100644
index 000000000000..927662705aa3
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
@@ -0,0 +1,22 @@
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys)
+
+-IF (BUILD_BUNDLED_LZ4)
+- MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
+- TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+
+-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
+- MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
+- TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+
+ IF(WITH_INNOBASE_STORAGE_ENGINE)
+