svn commit: r408832 - in head/databases: mariadb101-client/files mariadb101-server/files
Bernard Spil
brnrd at FreeBSD.org
Sat Feb 13 22:33:56 UTC 2016
Author: brnrd
Date: Sat Feb 13 22:33:53 2016
New Revision: 408832
URL: https://svnweb.freebsd.org/changeset/ports/408832
Log:
databases/mariadb101-{client,server}: Add missing patches
- Patches that were non-existent in the source of the repocopy
(mariadb100-*) were not part of the initial commit
Differential Revision: D3953
Added:
head/databases/mariadb101-client/files/patch-cmake_ssl.cmake (contents, props changed)
head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h (contents, props changed)
head/databases/mariadb101-server/files/patch-cmake_ssl.cmake (contents, props changed)
head/databases/mariadb101-server/files/patch-include_mysql_service__encryption.h (contents, props changed)
head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc (contents, props changed)
head/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt (contents, props changed)
head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt (contents, props changed)
head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt (contents, props changed)
head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake (contents, props changed)
Added: head/databases/mariadb101-client/files/patch-cmake_ssl.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-client/files/patch-cmake_ssl.cmake Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,18 @@
+MariaDB prefers static libraries, breaks builds with
+ports' OpenSSL libs
+
+--- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC
++++ cmake/ssl.cmake
+@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
+
+ # On mac this list is <.dylib;.so;.a>
+ # We prefer static libraries, so we revert it here.
+- IF (WITH_SSL_PATH)
+- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+- ENDIF()
++# IF (WITH_SSL_PATH)
++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
++# ENDIF()
+ FIND_LIBRARY(OPENSSL_LIBRARIES
+ NAMES ssl ssleay32 ssleay32MD
+ HINTS ${OPENSSL_ROOT_DIR}/lib)
Added: head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,14 @@
+--- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC
++++ include/mysql/service_encryption.h
+@@ -37,9 +37,11 @@ extern "C" {
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <stdlib.h>
+ #else
++#ifndef __FreeBSD__
+ #include <alloca.h>
+ #endif
+ #endif
++#endif
+
+ /* returned from encryption_key_get_latest_version() */
+ #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0)
Added: head/databases/mariadb101-server/files/patch-cmake_ssl.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-cmake_ssl.cmake Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,18 @@
+MariaDB prefers static libraries, breaks builds with
+ports' OpenSSL libs
+
+--- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC
++++ cmake/ssl.cmake
+@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL)
+
+ # On mac this list is <.dylib;.so;.a>
+ # We prefer static libraries, so we revert it here.
+- IF (WITH_SSL_PATH)
+- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+- ENDIF()
++# IF (WITH_SSL_PATH)
++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
++# ENDIF()
+ FIND_LIBRARY(OPENSSL_LIBRARIES
+ NAMES ssl ssleay32 ssleay32MD
+ HINTS ${OPENSSL_ROOT_DIR}/lib)
Added: head/databases/mariadb101-server/files/patch-include_mysql_service__encryption.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-include_mysql_service__encryption.h Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,16 @@
+Fix build error
+
+--- include/mysql/service_encryption.h.orig 2015-10-15 15:43:37 UTC
++++ include/mysql/service_encryption.h
+@@ -35,9 +35,11 @@ extern "C" {
+ #define inline __inline
+ #endif
+ #else
++#ifndef __FreeBSD__
+ #include <alloca.h>
+ #endif
+ #endif
++#endif
+
+ /* returned from encryption_key_get_latest_version() */
+ #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0)
Added: head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-plugin_auth__gssapi_gssapi__server.cc Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,22 @@
+From 3d794d0ee8e0a5a7dfbd3b7de056c0a3ccb9aa81 Mon Sep 17 00:00:00 2001
+From: Vladislav Vaintroub <wlad at mariadb.com>
+Date: Wed, 6 Jan 2016 09:15:19 +0100
+Subject: [PATCH] MDEV9494 Fix build for Heimdal Kerberos
+
+---
+ plugin/auth_gssapi/gssapi_server.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugin/auth_gssapi/gssapi_server.cc b/plugin/auth_gssapi/gssapi_server.cc
+index d325b2a..ed042a0 100644
+--- plugin/auth_gssapi/gssapi_server.cc.orig
++++ plugin/auth_gssapi/gssapi_server.cc
+@@ -58,7 +58,7 @@ static char* get_default_principal_name()
+ }
+
+ /* Check for entry in keytab */
+- if (krb5_kt_read_service_key(context, NULL, principal, 0, 0, &key))
++ if (krb5_kt_read_service_key(context, NULL, principal, 0, (krb5_enctype)0, &key))
+ {
+ sql_print_warning("GSSAPI plugin : default principal '%s' not found in keytab", unparsed_name);
+ goto cleanup;
Added: head/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,15 @@
+From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
+
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig 2015-10-15 15:43:50 UTC
++++ storage/mroonga/vendor/groonga/CMakeLists.txt
+@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
+ endif()
+
++if(CMAKE_COMPILER_IS_CLANGCXX)
++ MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
++endif()
++
+ if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
+ # For old CMake
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
Added: head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-storage_tokudb_CMakeLists.txt Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,24 @@
+--- storage/tokudb/CMakeLists.txt.orig 2015-12-23 15:33:32 UTC
++++ storage/tokudb/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ SET(TOKUDB_VERSION 5.6.26-74.0)
+ # PerconaFT only supports x86-64 and cmake-2.8.9+
+-IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
+- NOT CMAKE_VERSION VERSION_LESS "2.8.9")
++IF( ( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"
++ OR CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" )
++ AND NOT CMAKE_VERSION VERSION_LESS "2.8.9")
+ CHECK_CXX_SOURCE_COMPILES(
+ "
+ struct a {int b; int c; };
+@@ -107,8 +109,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+ TARGET_LINK_LIBRARIES(tokudb 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}")
+
+ SET(CPACK_RPM_server_PACKAGE_OBSOLETES
+ "${CPACK_RPM_server_PACKAGE_OBSOLETES} MariaDB-tokudb-engine < 10.0.5" PARENT_SCOPE)
Added: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_buildheader_CMakeLists.txt Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,21 @@
+Fix build failure due to Linuxisms (bash)
+
+--- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig 2015-12-23 16:33:32.000000000 +0100
++++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt 2016-01-03 15:09:21.941678309 +0100
+@@ -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 @@ add_executable(make_tdb make_tdb.cc)
+ 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")
Added: head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mariadb101-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake Sat Feb 13 22:33:53 2016 (r408832)
@@ -0,0 +1,37 @@
+--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig 2015-12-23 16:33:32.000000000 +0100
++++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake 2016-01-10 22:34:14.059204126 +0100
+@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB)
+ endif ()
+ endif ()
+
++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++ include_directories("/usr/include")
++
++ add_library(lzma SHARED IMPORTED)
++ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
++ "/usr/lib/liblzma.so")
++ELSE()
+ ## add lzma with an external project
+ set(xz_configure_opts --with-pic --enable-static)
+ if (APPLE)
+@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)
+ set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
+ add_dependencies(lzma build_lzma)
++ENDIF()
+
++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++ include_directories("/usr/local/include")
+
++ add_library(snappy SHARED IMPORTED)
++ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
++ "/usr/local/lib/libsnappy.so")
++ELSE()
+ ## add snappy with an external project
+ set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
+ if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
+@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)
+ set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
+ "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
+ add_dependencies(snappy build_snappy)
++ENDIF()
More information about the svn-ports-all
mailing list