diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-19 12:46:26 +0000 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-02-19 12:46:26 +0000 |
| commit | 11718094e20bddb8188b82875fa762dccaf1b511 (patch) | |
| tree | 3186e51eee3be7f96c256d215f9fe788f5879675 /databases/galera26 | |
| parent | 394f6e5b84fef9f71ebfc0eb41d5859ade8cb8fa (diff) | |
Notes
Diffstat (limited to 'databases/galera26')
| -rw-r--r-- | databases/galera26/Makefile | 14 | ||||
| -rw-r--r-- | databases/galera26/files/patch-galerautils_src_gu__byteswap.h | 14 |
2 files changed, 8 insertions, 20 deletions
diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile index f38a5f4e5bdf..9b8d59ca0e29 100644 --- a/databases/galera26/Makefile +++ b/databases/galera26/Makefile @@ -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,23 +31,22 @@ 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 \ lib/libgalera_smm.so diff --git a/databases/galera26/files/patch-galerautils_src_gu__byteswap.h b/databases/galera26/files/patch-galerautils_src_gu__byteswap.h index 42b5b5af8525..e91b329a6b22 100644 --- a/databases/galera26/files/patch-galerautils_src_gu__byteswap.h +++ b/databases/galera26/files/patch-galerautils_src_gu__byteswap.h @@ -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 |