Date: Sun, 3 Jan 2016 18:25:22 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405181 - in head/databases: mariadb100-client mariadb100-client/files mariadb100-server mariadb100-server/files Message-ID: <201601031825.u03IPMHp097340@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Jan 3 18:25:22 2016 New Revision: 405181 URL: https://svnweb.freebsd.org/changeset/ports/405181 Log: databases/mariadb100-{client,server}: Update to 10.0.23 - Update to 10.0.23 - Re-patch files due to path change in WRKSRC - Harmonize CONFLICTS and quench portlint warnings - Use variables to construct INSTALL_CONFLICTS - Fix json.cpp clang compilation issue - Refactor and upstream jemalloc patch Changes: - https://mariadb.com/kb/en/mariadb/mariadb-10023-changelog/ Reviewed by: koobs (mentor), feld (mentor) Approved by: koobs (mentor) Differential Revision: https://reviews.freebsd.org/D4709 Added: head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake - copied, changed from r405125, head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake head/databases/mariadb100-server/files/patch-storage_connect_json.cpp (contents, props changed) head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake - copied, changed from r404981, head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc - copied, changed from r404488, head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc Deleted: head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc Modified: head/databases/mariadb100-client/Makefile head/databases/mariadb100-server/Makefile head/databases/mariadb100-server/distinfo head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake Modified: head/databases/mariadb100-client/Makefile ============================================================================== --- head/databases/mariadb100-client/Makefile Sun Jan 3 18:13:44 2016 (r405180) +++ head/databases/mariadb100-client/Makefile Sun Jan 3 18:25:22 2016 (r405181) @@ -13,11 +13,6 @@ FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mariadb5*-client-* \ - mariadb10[1-9]-client-* \ - mysql*-client-* \ - percona*-client-* - CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql Copied and modified: head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake (from r405125, head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake) ============================================================================== --- head/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake Sun Jan 3 10:28:50 2016 (r405125, copy source) +++ head/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake Sun Jan 3 18:25:22 2016 (r405181) @@ -1,18 +1,28 @@ ---- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 -+++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 -@@ -24,12 +24,12 @@ +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC ++++ cmake/jemalloc.cmake +@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) + SET(what bundled) + ELSE() +- SET(libname jemalloc) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(libname c) ++ ELSE() ++ SET(libname jemalloc) ++ ENDIF() SET(what system) ENDIF() - CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(HAVE_JEMALLOC ON) ++ ELSE() ++ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ ENDIF() SET(CMAKE_REQUIRED_LIBRARIES) IF (HAVE_JEMALLOC) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Sun Jan 3 18:13:44 2016 (r405180) +++ head/databases/mariadb100-server/Makefile Sun Jan 3 18:25:22 2016 (r405181) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.22 +PORTVERSION= 10.0.23 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -64,6 +64,11 @@ DATADIR= ${PREFIX}/share/mysql .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. .endif +CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb10[1-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + .if !defined(CLIENT_ONLY) # MySQL-Server options USE_MYSQL= yes @@ -89,12 +94,6 @@ WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no USES+= readline .else # MySQL-Server part - -CONFLICTS_INSTALL= mariadb5*-server-* \ - mariadb10[1-9]-server-* \ - mysql*-server-* \ - percona*-server-* - USE_MYSQL= yes WANT_MYSQL_VER= 100m USE_RC_SUBR= mysql-server @@ -110,6 +109,9 @@ MROONGA_CMAKE_OFF= -DWITHOUT_MROONGA=1 OQGRAPH_CMAKE_OFF= -DWITHOUT_OQGRAPH=1 OQGRAPH_LIB_DEPENDS= libboost_system.so:${PORTSDIR}/devel/boost-libs \ libJudy.so:${PORTSDIR}/devel/judy +# Currently OQGraph does not build using clang. +# See See https://mariadb.atlassian.net/browse/MDEV-8051. +OQGRPAH_USE= gcc post-install: # Remove programs to avoid conflict with mariadb100-client @@ -134,11 +136,6 @@ CMAKE_ARGS+= -DWITH_JEMALLOC="no" USE_GCC= yes .endif -.if ${PORT_OPTIONS:MOQGRPAH} -IGNORE= currently MariaDB doesn't build correctly with OQGraph \ - See https://mariadb.atlassian.net/browse/MDEV-8128. -.endif - post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c Modified: head/databases/mariadb100-server/distinfo ============================================================================== --- head/databases/mariadb100-server/distinfo Sun Jan 3 18:13:44 2016 (r405180) +++ head/databases/mariadb100-server/distinfo Sun Jan 3 18:25:22 2016 (r405181) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.22.tar.gz) = 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b -SIZE (mariadb-10.0.22.tar.gz) = 56252325 +SHA256 (mariadb-10.0.23.tar.gz) = 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 +SIZE (mariadb-10.0.23.tar.gz) = 57394548 Modified: head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake ============================================================================== --- head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake Sun Jan 3 18:13:44 2016 (r405180) +++ head/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake Sun Jan 3 18:25:22 2016 (r405181) @@ -1,18 +1,28 @@ ---- cmake/jemalloc.cmake.orig 2015-06-17 14:54:11 UTC +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +++ cmake/jemalloc.cmake -@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) +@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) + SET(what bundled) + ELSE() +- SET(libname jemalloc) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(libname c) ++ ELSE() ++ SET(libname jemalloc) ++ ENDIF() SET(what system) ENDIF() - CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND ++ CMAKE_SYSTEM_VERSION STRGREATER "10.0") ++ SET(HAVE_JEMALLOC ON) ++ ELSE() ++ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) ++ ENDIF() SET(CMAKE_REQUIRED_LIBRARIES) IF (HAVE_JEMALLOC) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() Added: head/databases/mariadb100-server/files/patch-storage_connect_json.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mariadb100-server/files/patch-storage_connect_json.cpp Sun Jan 3 18:25:22 2016 (r405181) @@ -0,0 +1,13 @@ +# Add patch for https://mariadb.atlassian.net/browse/MDEV-9322 + +--- storage/connect/json.cpp.orig 2015-12-16 16:05:45 UTC ++++ storage/connect/json.cpp +@@ -594,7 +594,7 @@ PSZ Serialize(PGLOBAL g, PJSON jsp, char + if (fs) { + fputs(EL, fs); + fclose(fs); +- str = (err) ? NULL : "Ok"; ++ str = (err) ? NULL : (char*)"Ok"; + } else if (!err) { + str = ((JOUTSTR*)jp)->Strp; + jp->WriteChr('\0'); Copied and modified: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake (from r404981, head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake) ============================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake Fri Jan 1 11:31:08 2016 (r404981, copy source) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake Sun Jan 3 18:25:22 2016 (r405181) @@ -1,5 +1,5 @@ ---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake +--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL) endif () check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO) Copied and modified: head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc (from r404488, head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc) ============================================================================== --- head/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc Fri Dec 25 23:22:47 2015 (r404488, copy source) +++ head/databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc Sun Jan 3 18:25:22 2016 (r405181) @@ -1,5 +1,5 @@ ---- storage/tokudb/ft-index/portability/memory.cc.orig 2015-06-17 14:54:13 UTC -+++ storage/tokudb/ft-index/portability/memory.cc +--- storage/tokudb/PerconaFT/portability/memory.cc.orig 2015-06-17 14:54:13 UTC ++++ storage/tokudb/PerconaFT/portability/memory.cc @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT: #include <string.h> #include <stdio.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601031825.u03IPMHp097340>