diff options
author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-01-13 23:24:27 +0000 |
---|---|---|
committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2019-01-13 23:24:27 +0000 |
commit | 017db20ddf2c32ea444a09a2eeb61ee7853ec529 (patch) | |
tree | a003da78efb597badde0a6cc285a5ec4707bbb1f /databases/mysql80-client | |
parent | 0e460d94d5030ef3fd37b7f16d6e7f6d04d6c43e (diff) | |
download | ports-017db20ddf2c32ea444a09a2eeb61ee7853ec529.tar.gz ports-017db20ddf2c32ea444a09a2eeb61ee7853ec529.zip |
Notes
Diffstat (limited to 'databases/mysql80-client')
4 files changed, 50 insertions, 18 deletions
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile index 2d48a0d44d40..f666f66bf6f8 100644 --- a/databases/mysql80-client/Makefile +++ b/databases/mysql80-client/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 0 PKGNAMESUFFIX= 80-client COMMENT= Multithreaded SQL database (client) diff --git a/databases/mysql80-client/files/patch-client_CMakeLists.txt b/databases/mysql80-client/files/patch-client_CMakeLists.txt index 35bf110e5346..6a8f9eb39dad 100644 --- a/databases/mysql80-client/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-client/files/patch-client_CMakeLists.txt @@ -9,20 +9,20 @@ MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc @@ -57,11 +58,14 @@ ADD_COMPILE_FLAGS( - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema GenBootstrapPriv) ENDIF() +ENDIF() + SET(MYSQLTEST_SRC + mysqltest/mysqltest_expected_error.cc + ) + +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc ${MYSQLTEST_SRC} COMPONENT Test) TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) ADD_DEPENDENCIES(mysqltest GenError GenClientError) +ENDIF() - - ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) - TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -113,8 +117,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) diff --git a/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake new file mode 100644 index 000000000000..e2f70f193360 --- /dev/null +++ b/databases/mysql80-client/files/patch-cmake_os_FreeBSD.cmake @@ -0,0 +1,32 @@ +--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC ++++ cmake/os/FreeBSD.cmake +@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + IF(NOT HAVE_SUPPORTED_CLANG_VERSION) + MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") + ENDIF() +- ELSE() +- MESSAGE(FATAL_ERROR "Unsupported compiler!") ++ CHECK_C_SOURCE_RUNS(" ++ int main() ++ { ++ return (__clang_major__ >= 4); ++ }" I386_ATOMIC_BUILTINS) ++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) ++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") ++ ENDIF() ++ ELSEIF(CMAKE_COMPILER_IS_GNUCC) ++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion ++ OUTPUT_VARIABLE GCC_VERSION) ++ IF(GCC_VERSION VERSION_LESS 4.4) ++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ++ ENDIF() + ENDIF() + ENDIF() + + # Should not be needed any more, but kept for easy resurrection if needed + # #Legacy option, maybe not needed anymore , taken as is from autotools build + # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) +- ++# For GCC maybe it's also good idea to use ++# ADD_DEFINITIONS(-D_GNU_SOURCE) ++ diff --git a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt index 8deeef6509d1..e63cc1b920aa 100644 --- a/databases/mysql80-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql80-client/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- scripts/CMakeLists.txt.orig 2018-11-04 20:58:12 UTC +++ scripts/CMakeLists.txt -@@ -43,6 +43,7 @@ ELSE() +@@ -80,6 +80,7 @@ ELSE() MESSAGE(FATAL_ERROR "Cannot concatenate files") ENDIF() @@ -8,7 +8,7 @@ # Build mysql_fix_privilege_tables.c ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c -@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs +@@ -100,6 +101,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ) @@ -16,23 +16,23 @@ # If we do not have performance schema compiled in then sys will not work, # so only create an empty sys database with an auto-generated file, -@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER) +@@ -204,6 +206,7 @@ IF(NOT WITHOUT_SERVER) ) ENDIF() +IF(FALSE) IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) -@@ -150,6 +153,7 @@ IF(UNIX) +@@ -211,6 +214,7 @@ IF(UNIX) COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution ) ENDIF() +ENDIF() - IF(NOT WITHOUT_SERVER) - INSTALL(FILES -@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + # TCMalloc hacks + IF(MALLOC_LIB) +@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -41,7 +41,7 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -430,19 +436,7 @@ ELSE() +@@ -454,19 +460,7 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) |