cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/galera: unbreak in 13 and 14

Browse Source 
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@
This commit is contained in:
Fernando Apesteguía 2021-03-05 13:28:54 +00:00
parent b60fe8bb5e
commit 43678d149c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=567387
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
databases/galera/Makefile
View File

@ -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'

14
databases/galera/files/patch-galerautils_src_gu__byteswap.h Normal file
View File

@ -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