diff options
Diffstat (limited to 'databases/mariadb102-server/files')
7 files changed, 62 insertions, 56 deletions
diff --git a/databases/mariadb102-server/files/patch-include_CMakeLists.txt b/databases/mariadb102-server/files/patch-include_CMakeLists.txt index bae4fbb..aaa3ab9 100644 --- a/databases/mariadb102-server/files/patch-include_CMakeLists.txt +++ b/databases/mariadb102-server/files/patch-include_CMakeLists.txt @@ -1,27 +1,38 @@ ---- include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- include/CMakeLists.txt.orig 2017-08-17 10:05:38 UTC +++ include/CMakeLists.txt -@@ -64,20 +64,24 @@ SET(HEADERS - json_lib.h - ) +@@ -1,5 +1,5 @@ + # Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +-# ++# + # This program is free software; you can redistribute it and/or modify + # it under the terms of the GNU General Public License as published by + # the Free Software Foundation; version 2 of the License. +@@ -68,6 +68,7 @@ SET(HEADERS + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h + DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) +IF(FALSE) - INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) + INSTALL(FILES ${HEADERS} + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) +@@ -75,17 +76,20 @@ FOREACH(f ${HEADERS_GEN_CONFIGURE}) + DESTINATION ${INSTALL_INCLUDEDIR}/server COMPONENT Development) ENDFOREACH(f) - INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") + INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/server/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h") +ENDIF() STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") + MACRO(INSTALL_PRIVATE DIR) +IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) + INSTALL(DIRECTORY ${DIR}/. + DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development + FILES_MATCHING PATTERN "*.h" + PATTERN CMakeFiles EXCLUDE + PATTERN mysql EXCLUDE + REGEX "\\./(${EXCL_RE}$)" EXCLUDE) +ENDIF() + ENDMACRO() - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" + INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt index 8efeb81..c09bb5f 100644 --- a/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt +++ b/databases/mariadb102-server/files/patch-pcre_CMakeLists.txt @@ -1,13 +1,11 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- pcre/CMakeLists.txt.orig 2017-05-14 23:13:17 UTC +--- pcre/CMakeLists.txt.orig 2017-08-17 10:05:39 UTC +++ pcre/CMakeLists.txt @@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) +IF(FALSE) - INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) + INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development) +ENDIF() # end CMakeLists.txt diff --git a/databases/mariadb102-server/files/patch-sql_CMakeLists.txt b/databases/mariadb102-server/files/patch-sql_CMakeLists.txt index e411d0f..7e20f9f 100644 --- a/databases/mariadb102-server/files/patch-sql_CMakeLists.txt +++ b/databases/mariadb102-server/files/patch-sql_CMakeLists.txt @@ -1,8 +1,6 @@ -Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options - ---- sql/CMakeLists.txt.orig 2017-05-14 23:13:18 UTC +--- sql/CMakeLists.txt.orig 2017-08-17 10:05:40 UTC +++ sql/CMakeLists.txt -@@ -379,6 +379,7 @@ ADD_CUSTOM_TARGET(distclean +@@ -386,6 +386,7 @@ ADD_CUSTOM_TARGET(distclean VERBATIM ) @@ -10,7 +8,7 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options IF(INSTALL_LAYOUT STREQUAL "STANDALONE") # Copy db.opt into data/test/ -@@ -422,6 +423,7 @@ ELSE() +@@ -429,6 +430,7 @@ ELSE() INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) ENDIF(WIN32 AND MYSQLD_EXECUTABLE) ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE") @@ -18,12 +16,12 @@ Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options IF(WIN32) SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql) -@@ -465,7 +467,9 @@ IF(WIN32) +@@ -472,7 +474,9 @@ IF(WIN32) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) ENDIF(WIN32) +IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development + INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development FILES_MATCHING PATTERN "*.h" PATTERN share EXCLUDE PATTERN CMakeFiles EXCLUDE) diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h b/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h new file mode 100644 index 0000000..4dab8ea --- /dev/null +++ b/databases/mariadb102-server/files/patch-storage_rocksdb_rdb__datadic.h @@ -0,0 +1,10 @@ +--- storage/rocksdb/rdb_datadic.h.orig 2017-09-25 06:33:26 UTC ++++ storage/rocksdb/rdb_datadic.h +@@ -16,6 +16,7 @@ + #pragma once + + /* C++ standard header files */ ++#include <cstdlib> + #include <algorithm> + #include <atomic> + #include <map> diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc deleted file mode 100644 index 3b89cba..0000000 --- a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_db__impl.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- storage/rocksdb/rocksdb/db/db_impl.cc.orig 2017-05-25 21:54:40 UTC -+++ storage/rocksdb/rocksdb/db/db_impl.cc -@@ -18,7 +18,7 @@ - #ifdef OS_SOLARIS - #include <alloca.h> - #endif --#ifdef ROCKSDB_JEMALLOC -+#if defined(ROCKSDB_JEMALLOC) && !defined(__FreeBSD__) - #include "jemalloc/jemalloc.h" - #endif - -@@ -400,7 +400,11 @@ static void DumpMallocStats(std::string* - std::unique_ptr<char[]> buf{new char[kMallocStatusLen + 1]}; - mstat.cur = buf.get(); - mstat.end = buf.get() + kMallocStatusLen; -+#ifdef __FreeBSD__ -+ __malloc_stats_print(GetJemallocStatus, &mstat, ""); -+#else - je_malloc_stats_print(GetJemallocStatus, &mstat, ""); -+#endif - stats->append(buf.get()); - #endif // ROCKSDB_JEMALLOC - } diff --git a/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc new file mode 100644 index 0000000..0114e08 --- /dev/null +++ b/databases/mariadb102-server/files/patch-storage_rocksdb_rocksdb_db_malloc__stats.cc @@ -0,0 +1,15 @@ +--- storage/rocksdb/rocksdb/db/malloc_stats.cc.orig 2017-08-17 10:05:38 UTC ++++ storage/rocksdb/rocksdb/db/malloc_stats.cc +@@ -16,7 +16,12 @@ + namespace rocksdb { + + #ifdef ROCKSDB_JEMALLOC ++#ifdef __FreeBSD__ ++#include <malloc_np.h> ++#define je_malloc_stats_print malloc_stats_print ++#else + #include "jemalloc/jemalloc.h" ++#endif + + typedef struct { + char* cur; diff --git a/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt index a8a1ce2..e758135 100644 --- a/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt +++ b/databases/mariadb102-server/files/patch-storage_tokudb_CMakeLists.txt @@ -1,12 +1,9 @@ ---- storage/tokudb/CMakeLists.txt.orig 2017-05-14 23:13:20 UTC -+++ storage/tokudb/CMakeLists.txt -@@ -108,9 +108,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA +--- storage/tokudb/CMakeLists.txt.orig 2017-09-25 08:33:26.000000000 +0200 ++++ storage/tokudb/CMakeLists.txt 2017-09-28 21:46:55.119327000 +0200 +@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA + TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++) - +- -SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin") -SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin") -- - IF (INSTALL_SYSCONF2DIR) - INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR} - COMPONENT tokudb-engine) |
