Date: Tue, 26 May 2020 07:42:22 +0000 (UTC) From: Oleksii Samorukov <samm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536578 - in head/databases/xtrabackup: . files Message-ID: <202005260742.04Q7gM0L061570@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: samm Date: Tue May 26 07:42:22 2020 New Revision: 536578 URL: https://svnweb.freebsd.org/changeset/ports/536578 Log: databases/xtrabackup: update to the 2.4.20 Changelog: https://www.percona.com/doc/percona-xtrabackup/2.4/release-notes.html Approved by: krion (mentor) Differential Revision: https://reviews.freebsd.org/D25007 Modified: head/databases/xtrabackup/Makefile head/databases/xtrabackup/distinfo head/databases/xtrabackup/files/patch-cmake-install_layout.cmake head/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake head/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c Modified: head/databases/xtrabackup/Makefile ============================================================================== --- head/databases/xtrabackup/Makefile Tue May 26 07:30:07 2020 (r536577) +++ head/databases/xtrabackup/Makefile Tue May 26 07:42:22 2020 (r536578) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= xtrabackup -DISTVERSION= 2.4.15 +DISTVERSION= 2.4.20 CATEGORIES= databases -MASTER_SITES= https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \ - SF/boost/boost/1.59.0/:boost +MASTER_SITES= https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \ + https://ftp.osuosl.org/pub/blfs/conglomeration/boost/:boost SF/boost/boost/1.59.0/:boost DISTFILES= percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \ boost_1_59_0.tar.bz2:boost @@ -31,6 +31,7 @@ RUN_DEPENDS= qpress:archivers/qpress # autotool is in use for 5.1 builds USES= alias autoreconf:build bison cmake:noninja compiler:c++11-lang \ cpe gettext libtool perl5 shebangfix +USE_CXXSTD= c++11 CPE_VENDOR= percona SHEBANG_FILES= storage/innobase/xtrabackup/xbcloud_osenv.sh CMAKE_ARGS= -DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF Modified: head/databases/xtrabackup/distinfo ============================================================================== --- head/databases/xtrabackup/distinfo Tue May 26 07:30:07 2020 (r536577) +++ head/databases/xtrabackup/distinfo Tue May 26 07:42:22 2020 (r536578) @@ -1,5 +1,5 @@ -TIMESTAMP = 1570253950 -SHA256 (percona-xtrabackup-2.4.15.tar.gz) = ea8e50b50ff7230220329431339a1f3d97af2365a31f2afe6533d13ff95c20db -SIZE (percona-xtrabackup-2.4.15.tar.gz) = 57357749 +TIMESTAMP = 1590443927 +SHA256 (percona-xtrabackup-2.4.20.tar.gz) = 4b751f104de7757dfb9bd83f8f045a17dc9f96325dcf4fb6a3d4b8cd5e499b2d +SIZE (percona-xtrabackup-2.4.20.tar.gz) = 59782001 SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca SIZE (boost_1_59_0.tar.bz2) = 70389425 Modified: head/databases/xtrabackup/files/patch-cmake-install_layout.cmake ============================================================================== --- head/databases/xtrabackup/files/patch-cmake-install_layout.cmake Tue May 26 07:30:07 2020 (r536577) +++ head/databases/xtrabackup/files/patch-cmake-install_layout.cmake Tue May 26 07:42:22 2020 (r536578) @@ -1,6 +1,6 @@ ---- cmake/install_layout.cmake 2017-02-06 18:02:22.189764000 +0000 -+++ cmake/install_layout.cmake 2017-02-06 18:02:29.642407000 +0000 -@@ -160,7 +160,7 @@ +--- cmake/install_layout.cmake.orig 2020-04-10 19:45:19 UTC ++++ cmake/install_layout.cmake +@@ -160,7 +160,7 @@ SET(INSTALL_INFODIR_STANDALONE "docs") # SET(INSTALL_SHAREDIR_STANDALONE "share") SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") Modified: head/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake ============================================================================== --- head/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake Tue May 26 07:30:07 2020 (r536577) +++ head/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake Tue May 26 07:42:22 2020 (r536578) @@ -1,9 +1,17 @@ ---- cmake/os/FreeBSD.cmake.orig 2019-07-19 15:13:48 UTC +--- cmake/os/FreeBSD.cmake.orig 2020-05-26 05:35:19 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,12 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) - IF(NOT HAVE_SUPPORTED_CLANG_VERSION) - MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") +@@ -36,6 +36,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) + IF(GCC_VERSION VERSION_LESS 4.4) + MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") ENDIF() ++ 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) @@ -13,3 +21,11 @@ ELSE() MESSAGE(FATAL_ERROR "Unsupported compiler!") ENDIF() +@@ -44,4 +58,6 @@ 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) ++ Modified: head/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c ============================================================================== --- head/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c Tue May 26 07:30:07 2020 (r536577) +++ head/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c Tue May 26 07:42:22 2020 (r536578) @@ -1,6 +1,6 @@ ---- storage/myisam/mi_dynrec.c.orig 2018-03-16 23:50:04.334166000 +0300 -+++ storage/myisam/mi_dynrec.c 2018-03-16 23:50:29.996533000 +0300 -@@ -65,18 +65,13 @@ +--- storage/myisam/mi_dynrec.c.orig 2020-04-10 19:45:19 UTC ++++ storage/myisam/mi_dynrec.c +@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size) DBUG_RETURN(1); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005260742.04Q7gM0L061570>