diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-06 10:28:05 +0100 |
| commit | f1af93971b7490792d8541bc790e0d8c6d787059 (patch) | |
| tree | a38046712bbc3a3844d77452d16c84e716caa3d4 /dev-db/mysql-connector-c/files | |
| parent | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff) | |
gentoo resync : 06.08.2019
Diffstat (limited to 'dev-db/mysql-connector-c/files')
2 files changed, 46 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) + diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch new file mode 100644 index 000000000000..8fabd9952cc4 --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/692644 + +--- a/include/mysql.h.pp ++++ b/include/mysql.h.pp +@@ -175,7 +175,7 @@ struct rand_struct { + unsigned long seed1, seed2, max_value; + double max_value_dbl; + }; +-#include <mysql/udf_registration_types.h> ++#include "mysql/udf_registration_types.h" + enum Item_result { + INVALID_RESULT = -1, + STRING_RESULT = 0, +--- a/include/mysql_com.h ++++ b/include/mysql_com.h +@@ -1002,7 +1002,7 @@ struct rand_struct { + }; + + /* Include the types here so existing UDFs can keep compiling */ +-#include <mysql/udf_registration_types.h> ++#include "mysql/udf_registration_types.h" + + /** + @addtogroup group_cs_compresson_constants Constants when using compression |