diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-03-05 13:28:54 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-03-05 13:28:54 +0000 |
| commit | 43678d149c440a23807b5eedc9c6a3195ed82a95 (patch) | |
| tree | bc19d207eccdcd65e04e8c27650b42eff1ce7e4c /databases | |
| parent | b60fe8bb5e47f83f65f90f885592e18d14c64359 (diff) | |
| download | ports-43678d149c440a23807b5eedc9c6a3195ed82a95.tar.gz ports-43678d149c440a23807b5eedc9c6a3195ed82a95.zip | |
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@
Notes
Notes:
svn path=/head/; revision=567387
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/galera/Makefile | 2 | ||||
| -rw-r--r-- | databases/galera/files/patch-galerautils_src_gu__byteswap.h | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/databases/galera/Makefile b/databases/galera/Makefile index 43f65c8616d3..dfe4b8580b90 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -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' diff --git a/databases/galera/files/patch-galerautils_src_gu__byteswap.h b/databases/galera/files/patch-galerautils_src_gu__byteswap.h new file mode 100644 index 000000000000..e91b329a6b22 --- /dev/null +++ b/databases/galera/files/patch-galerautils_src_gu__byteswap.h @@ -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 |