From owner-svn-ports-all@freebsd.org Fri Feb 19 12:46:27 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B5A62529EB5; Fri, 19 Feb 2021 12:46:27 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DhrtC4qnGz4Qtp; Fri, 19 Feb 2021 12:46:27 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 982353F4B; Fri, 19 Feb 2021 12:46:27 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11JCkRf8096376; Fri, 19 Feb 2021 12:46:27 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11JCkRBK096374; Fri, 19 Feb 2021 12:46:27 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202102191246.11JCkRBK096374@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Fri, 19 Feb 2021 12:46:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566059 - in head/databases/galera26: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/databases/galera26: . files X-SVN-Commit-Revision: 566059 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2021 12:46:27 -0000 Author: fernape Date: Fri Feb 19 12:46:26 2021 New Revision: 566059 URL: https://svnweb.freebsd.org/changeset/ports/566059 Log: databases/galera26: Fix build on FreeBSD13 Use bswap macros as provided by FreeBSD. While here regenerate some patches and tidy Makefile up. PR: 253612 Submitted by: devin@sevenlayer.studio Approved by: devel@galeracluster.com (maintainer) Modified: head/databases/galera26/Makefile head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h Modified: head/databases/galera26/Makefile ============================================================================== --- head/databases/galera26/Makefile Fri Feb 19 12:43:28 2021 (r566058) +++ head/databases/galera26/Makefile Fri Feb 19 12:46:26 2021 (r566059) @@ -4,7 +4,7 @@ PORTNAME= galera PORTVERSION= 26.4.6 DISTVERSIONPREFIX= release_ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases PKGNAMESUFFIX= 26 @@ -13,9 +13,6 @@ COMMENT= Synchronous multi-master replication engine LICENSE= GPLv2 -BROKEN_FreeBSD_13= galerautils/src/gu_int128.h:163:20: error: use of undeclared identifier '__bswap64_var' -BROKEN_FreeBSD_14= galerautils/src/gu_int128.h:163:20: error: use of undeclared identifier '__bswap64_var' -BROKEN_riscv64= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var' NOT_FOR_ARCHS= i386 # On i386 older versions of clang produce: # cannot compile this atomic library call yet ... __atomic_add_fetch @@ -34,22 +31,21 @@ LIB_DEPENDS= libboost_date_time.so:devel/boost-libs USES= compiler:c++11-lang python:build scons ssl -USE_LDCONFIG= yes - USE_GITHUB= yes GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src -LDFLAGS+= -lboost_program_options -lboost_system -MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0 - +USE_LDCONFIG= yes USE_RC_SUBR= garb.sh +MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0 # Abuse TEST_TARGET to append tests=1 (which is not a target, strictly # speaking) at the end of the "scons ..." command so that it overrides # tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove # all *.passed files: find ./work -name *.passed -print -delete TEST_TARGET= deterministic_tests=1 tests=1 + +LDFLAGS+= -lboost_program_options -lboost_system PLIST_FILES= bin/garbd \ lib/libgalera.so \ Modified: head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h ============================================================================== --- head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h Fri Feb 19 12:43:28 2021 (r566058) +++ head/databases/galera26/files/patch-galerautils_src_gu__byteswap.h Fri Feb 19 12:46:26 2021 (r566059) @@ -1,22 +1,14 @@ --- galerautils/src/gu_byteswap.h.orig 2020-10-12 06:33:51 UTC +++ galerautils/src/gu_byteswap.h -@@ -54,10 +54,15 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x, +@@ -53,11 +53,6 @@ static GU_FORCE_INLINE uint64_t GU_ROTL64 (uint64_t x, + # define gu_bswap16 _OSSwapInt16 # define gu_bswap32 _OSSwapInt32 # define gu_bswap64 _OSSwapInt64 - #elif defined(__FreeBSD__) +-#elif defined(__FreeBSD__) -/* do not use bswapXX, because gcc44 gives old-style cast warnings */ -# define gu_bswap16 __bswap16_var -# define gu_bswap32 __bswap32_var -# define gu_bswap64 __bswap64_var -+# if defined(__aarch64__) || defined(__arm__) -+# define gu_bswap16 bswap16 -+# define gu_bswap32 bswap32 -+# define gu_bswap64 bswap64 -+# else -+# define gu_bswap16 __bswap16_var -+# define gu_bswap32 __bswap32_var -+# define gu_bswap64 __bswap64_var -+# endif // __FreeBSD__ #elif defined(__sun__) # define gu_bswap16 BSWAP_16 # define gu_bswap32 BSWAP_32