Date: Fri, 5 Mar 2021 13:28:55 +0000 (UTC) From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= <fernape@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567387 - in head/databases/galera: . files Message-ID: <202103051328.125DStwN053751@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103051328.125DStwN053751>