From owner-svn-ports-head@freebsd.org Fri Mar 5 13:28:55 2021 Return-Path: Delivered-To: svn-ports-head@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 C676C55A93C; Fri, 5 Mar 2021 13:28:55 +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 4DsT8l5G68z4dxK; Fri, 5 Mar 2021 13:28:55 +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 A799711397; Fri, 5 Mar 2021 13:28:55 +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 125DStHW053752; Fri, 5 Mar 2021 13:28:55 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 125DStwN053751; Fri, 5 Mar 2021 13:28:55 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202103051328.125DStwN053751@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, 5 Mar 2021 13:28:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567387 - in head/databases/galera: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/databases/galera: . files X-SVN-Commit-Revision: 567387 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2021 13:28:55 -0000 Author: fernape Date: Fri Mar 5 13:28:54 2021 New Revision: 567387 URL: https://svnweb.freebsd.org/changeset/ports/567387 Log: databases/galera: unbreak in 13 and 14 Apply the same patch as in databases/galera26 in r566059. This probably unbreaks other architectures but I can't test them. PR: 253612 Reported by: brd@ Added: head/databases/galera/files/patch-galerautils_src_gu__byteswap.h (contents, props changed) Modified: head/databases/galera/Makefile Modified: head/databases/galera/Makefile ============================================================================== --- head/databases/galera/Makefile Fri Mar 5 13:28:35 2021 (r567386) +++ head/databases/galera/Makefile Fri Mar 5 13:28:54 2021 (r567387) @@ -12,8 +12,6 @@ COMMENT= Synchronous multi-master replication engine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -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_aarch64= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var' BROKEN_armv6= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var' BROKEN_armv7= fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var' Added: head/databases/galera/files/patch-galerautils_src_gu__byteswap.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/galera/files/patch-galerautils_src_gu__byteswap.h Fri Mar 5 13:28:54 2021 (r567387) @@ -0,0 +1,14 @@ +--- galerautils/src/gu_byteswap.h.orig 2020-10-12 06:33:51 UTC ++++ galerautils/src/gu_byteswap.h +@@ -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__) +-/* 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 + #elif defined(__sun__) + # define gu_bswap16 BSWAP_16 + # define gu_bswap32 BSWAP_32