mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 13:20:32 -04:00
6a9a1171e6
percona57-client: - Install compat pkgconfig symlink as well as it done for libs (many packages still search for mysqlclient.pc only) percona57-server: - Proper use system lz4/zstd libs for rocksdb engine - Declare system libevent to use instead of bundled one - Stop pollute libdata/pkgconfig dir with unneeded .pc file - Unbreak build with DEFAULT_VERSIONS+=ssl=libressl PR: 239347 Submitted by: fluffy [cleanups], Igor Zabelin [update] Approved by: maintainer (timeout, >3 months)
95 lines
4.2 KiB
Text
95 lines
4.2 KiB
Text
--- storage/tokudb/CMakeLists.txt.orig 2016-03-03 15:32:33.000000000 +0200
|
|
+++ storage/tokudb/CMakeLists.txt 2016-03-08 10:13:58.000000000 +0200
|
|
@@ -40,8 +40,8 @@
|
|
ENDIF ()
|
|
|
|
# check platform support, no 32 bit
|
|
-IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
|
|
- MESSAGE (${TOKUDB_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB")
|
|
+IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
|
|
+ MESSAGE (${TOKUDB_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB")
|
|
RETURN ()
|
|
ENDIF ()
|
|
|
|
@@ -118,5 +118,5 @@
|
|
tokudb_thread.cc)
|
|
MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
|
|
LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} 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")
|
|
+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
|
|
+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
|
|
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig 2016-03-03 15:31:53.000000000 +0200
|
|
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt 2016-03-10 11:13:23.772664272 +0200
|
|
@@ -69,7 +69,7 @@
|
|
endif ()
|
|
endfunction(add_space_separated_property)
|
|
|
|
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
|
|
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
|
|
if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
|
|
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
|
|
endif ()
|
|
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig 2016-03-03 15:31:53.000000000 +0200
|
|
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc 2016-03-08 10:40:07.000000000 +0200
|
|
@@ -85,7 +85,7 @@
|
|
if (oflag & O_CREAT) {
|
|
va_list ap;
|
|
va_start(ap, oflag);
|
|
- mode_t mode = va_arg(ap, mode_t);
|
|
+ mode_t mode = va_arg(ap, int);
|
|
va_end(ap);
|
|
the_manager.lock_file_op();
|
|
fd = call_real_open(file, oflag, mode);
|
|
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig 2016-03-03 15:31:53.000000000 +0200
|
|
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc 2016-03-08 10:37:19.000000000 +0200
|
|
@@ -36,7 +36,7 @@
|
|
|
|
#include <string.h>
|
|
#include <pthread.h>
|
|
-#include <malloc.h>
|
|
+#include <stdlib.h>
|
|
#include <stdio.h>
|
|
|
|
#include "source_file.h"
|
|
--- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig 2016-03-03 15:31:53.000000000 +0200
|
|
+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc 2016-03-08 10:38:58.000000000 +0200
|
|
@@ -104,7 +104,7 @@
|
|
if (oflag & O_CREAT) {
|
|
va_list op;
|
|
va_start(op, oflag);
|
|
- mode_t mode = va_arg(op, mode_t);
|
|
+ mode_t mode = va_arg(op, int);
|
|
va_end(op);
|
|
return real_open(file, oflag, mode);
|
|
} else {
|
|
--- storage/tokudb/PerconaFT/CMakeLists.txt.orig 2016-06-30 13:35:08.000000000 +0200
|
|
+++ storage/tokudb/PerconaFT/CMakeLists.txt 2016-07-29 23:07:37.871068000 +0200
|
|
@@ -82,7 +82,7 @@
|
|
|
|
install(
|
|
FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
|
|
- DESTINATION .
|
|
+ DESTINATION ${INSTALL_DOCDIR}
|
|
COMPONENT tokukv_misc
|
|
)
|
|
|
|
--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2016-07-29 23:30:26.557847000 +0200
|
|
+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-07-29 23:30:32.695950000 +0200
|
|
@@ -1,6 +1,6 @@
|
|
set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
|
|
|
|
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
|
|
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
|
|
out=$1; shift
|
|
exec \"$@\" >$out")
|
|
|
|
@@ -8,7 +8,7 @@
|
|
set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
|
|
add_custom_command(
|
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
|
|
- COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
|
|
+ COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
|
|
DEPENDS make_tdb)
|
|
add_custom_target(install_tdb_h DEPENDS
|
|
"${CMAKE_CURRENT_BINARY_DIR}/db.h")
|