Attachment #221487 for bug #252604

View | Details | Raw Unified | Return to bug 252604
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	galera
PORTVERSION=	26.4.7
DISTVERSIONPREFIX=	release_
PORTREVISION=	0
CATEGORIES=	databases

		objdump:devel/binutils
LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs

USES=		compiler:c++11-lang python:build cmake ssl

USE_LDCONFIG=	yes


GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
		codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src

CMAKE_ARGS+=	-DGALERA_REVISION=${GH_TAGNAME}
MAKE_ARGS+=	revno=${GH_TAGNAME} system_asio=0 tests=0

USE_RC_SUBR=	garb.sh

# 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

PLIST_FILES=	bin/garbd \
		lib/libgalera.so \
		lib/libgalera_smm.so

post-install:
	${RLN} ${STAGEDIR}/${PREFIX}/lib/libgalera_smm.so ${STAGEDIR}/${PREFIX}/lib/libgalera.so

BOOSTPOOL_DESC=	Use boost pool allocator
BPOSTATIC_DESC=	Use static boost_program_options

BOOSTPOOL_MAKE_ARGS=	boost_pool=1
BPOSTATIC_MAKE_ARGS=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
DEBUG_MAKE_ARGS=	debug=0

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
	${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
		libgalera.so)

.include <bsd.port.mk>

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603735085	1	TIMESTAMP = 1610114975
2	SHA256 (codership-galera-release_26.4.6_GH0.tar.gz) = d1d0f300bcf1097191f438952e7ceea59f40e158cf2c5f83b325da5437728b99	2	SHA256 (codership-galera-release_26.4.7_GH0.tar.gz) = 77d519c66e588660f0d1d5d23e87d8d515ff5c6f94c618f6730c9c10312915dc
3	SIZE (codership-galera-release_26.4.6_GH0.tar.gz) = 3438009	3	SIZE (codership-galera-release_26.4.7_GH0.tar.gz) = 3445191
4	SHA256 (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = ac782d33d84a874d89bbe4eeb818ab56ae729aee4c491f91892694a2e134c558	4	SHA256 (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = ac782d33d84a874d89bbe4eeb818ab56ae729aee4c491f91892694a2e134c558
5	SIZE (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = 50214	5	SIZE (codership-wsrep-API-75a5f452f2ba07b0f4a3a9a94825fccc71b27398_GH0.tar.gz) = 50214




--- CMakeLists.txt.orig	2020-12-29 15:10:20 UTC
+++ CMakeLists.txt
@@ -105,14 +105,16 @@ add_subdirectory(galera)
 add_subdirectory(scripts/packages)
 add_subdirectory(wsrep/tests)
 
-install(FILES
-  ${CMAKE_SOURCE_DIR}/AUTHORS
-  ${CMAKE_SOURCE_DIR}/COPYING
-  ${CMAKE_SOURCE_DIR}/README
-  DESTINATION doc)
-install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
-  DESTINATION doc
-  RENAME LICENSE.asio)
+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/AUTHORS
+    ${CMAKE_SOURCE_DIR}/COPYING
+    ${CMAKE_SOURCE_DIR}/README
+    DESTINATION doc)
+  install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
+    DESTINATION doc
+    RENAME LICENSE.asio)
+endif()
 
 message(STATUS "")
 message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")




--- cmake/compiler.cmake.orig	2021-01-12 07:58:44 UTC
+++ cmake/compiler.cmake
@@ -41,6 +41,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
   # Enable debug sync points
   add_definitions(-DGU_DBUG_ON)
+else()
+  # Due to liberal use of assert() in some modules, make sure that
+  # non-debug builds have -DNDEBUG enabled.
+  add_definitions(-DNDEBUG)
 endif()
 
 if (GALERA_GU_DEBUG_MUTEX)




--- galerautils/src/gu_crc32c_arm64.c.orig	2020-12-29 15:10:20 UTC
+++ galerautils/src/gu_crc32c_arm64.c
@@ -83,7 +83,13 @@ gu_crc32c_func_t
 gu_crc32c_func_t
 gu_crc32c_hardware()
 {
 #if defined(GU_AT_HWCAP)
-    unsigned long int const hwcaps = getauxval(GU_AT_HWCAP);
+#if defined(__linux__)
+     unsigned long int const hwcaps = getauxval(AT_HWCAP);
+#endif
+#if defined(__FreeBSD__)
+    unsigned long hwcaps;
+    elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps));
+#endif
     if (hwcaps & GU_HWCAP_CRC32)
     {
         gu_info ("CRC-32C: using hardware acceleration.");




--- garb/CMakeLists.txt.orig	2021-01-08 11:51:42 UTC
+++ garb/CMakeLists.txt
@@ -32,11 +32,13 @@ target_link_libraries(garbd gcs4garb gcomm gcache
   ${Boost_PROGRAM_OPTIONS_LIBRARIES})
 
 install(TARGETS garbd DESTINATION bin)
-install(FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
-  ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
-  DESTINATION share)
-install(FILES
-  ${CMAKE_SOURCE_DIR}/man/garbd.8
-  DESTINATION man/man8)
+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
+  install(FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
+    ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
+    DESTINATION share)
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/man/garbd.8
+    DESTINATION man/man8)
+endif()

Return to bug 252604

Lines 2-8 Link Here

(-)Makefile (-24 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= galera	4	PORTNAME= galera
5	PORTVERSION= 26.4.6	5	PORTVERSION= 26.4.7
6	DISTVERSIONPREFIX= release_	6	DISTVERSIONPREFIX= release_
7	PORTREVISION= 0	7	PORTREVISION= 0
8	CATEGORIES= databases	8	CATEGORIES= databases
Lines 30-36 Link Here
30	objdump:devel/binutils	30	objdump:devel/binutils
31	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs	31	LIB_DEPENDS= libboost_date_time.so:devel/boost-libs
32		32
33	USES= compiler:c++11-lang python:build scons ssl	33	USES= compiler:c++11-lang python:build cmake ssl
34		34
35	USE_LDCONFIG= yes	35	USE_LDCONFIG= yes
36		36
Lines 38-71 Link Here
38	GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \	38	GH_TUPLE?= codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
39	codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src	39	codership:wsrep-API:75a5f452f2ba07b0f4a3a9a94825fccc71b27398:dummy/wsrep/src
40		40
41	LDFLAGS+= -lboost_program_options -lboost_system	41	CMAKE_ARGS+= -DGALERA_REVISION=${GH_TAGNAME}
42	MAKE_ARGS+= revno=${GH_TAGNAME} system_asio=0 tests=0
43		42
44	USE_RC_SUBR= garb.sh	43	USE_RC_SUBR= garb.sh
45		44
46	# Abuse TEST_TARGET to append tests=1 (which is not a target, strictly
47	# speaking) at the end of the "scons ..." command so that it overrides
48	# tests=0 from ${MAKE_ARGS}. To rerun the tests a second time, remove
49	# all .passed files: find ./work -name .passed -print -delete
50	TEST_TARGET= deterministic_tests=1 tests=1
51
52	PLIST_FILES= bin/garbd \	45	PLIST_FILES= bin/garbd \
53	lib/libgalera.so \	46	lib/libgalera.so \
54	lib/libgalera_smm.so	47	lib/libgalera_smm.so
55		48
56	OPTIONS_DEFINE= BOOSTPOOL BPOSTATIC DEBUG	49	post-install:
		50	${RLN} ${STAGEDIR}/${PREFIX}/lib/libgalera_smm.so ${STAGEDIR}/${PREFIX}/lib/libgalera.so
57		51
58	BOOSTPOOL_DESC= Use boost pool allocator
59	BPOSTATIC_DESC= Use static boost_program_options
60
61	BOOSTPOOL_MAKE_ARGS= boost_pool=1
62	BPOSTATIC_MAKE_ARGS= bpostatic=${LOCALBASE}/lib/libboost_program_options.a
63	DEBUG_MAKE_ARGS= debug=0
64
65	do-install:
66	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
67	${INSTALL_LIB} ${WRKSRC}/libgalera_smm.so ${STAGEDIR}${PREFIX}/lib/
68	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
69	libgalera.so)
70
71	.include <bsd.port.mk>	52	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+27 lines)
	1	--- CMakeLists.txt.orig 2020-12-29 15:10:20 UTC
	2	+++ CMakeLists.txt
	3	@@ -105,14 +105,16 @@ add_subdirectory(galera)
	4	add_subdirectory(scripts/packages)
	5	add_subdirectory(wsrep/tests)
	6
	7	-install(FILES
	8	- ${CMAKE_SOURCE_DIR}/AUTHORS
	9	- ${CMAKE_SOURCE_DIR}/COPYING
	10	- ${CMAKE_SOURCE_DIR}/README
	11	- DESTINATION doc)
	12	-install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
	13	- DESTINATION doc
	14	- RENAME LICENSE.asio)
	15	+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
	16	+ install(FILES
	17	+ ${CMAKE_SOURCE_DIR}/AUTHORS
	18	+ ${CMAKE_SOURCE_DIR}/COPYING
	19	+ ${CMAKE_SOURCE_DIR}/README
	20	+ DESTINATION doc)
	21	+ install(FILES ${CMAKE_SOURCE_DIR}/asio/LICENSE_1_0.txt
	22	+ DESTINATION doc
	23	+ RENAME LICENSE.asio)
	24	+endif()
	25
	26	message(STATUS "")
	27	message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")

Line 0 Link Here

(-)files/patch-cmake_compiler.cmake (+13 lines)
	1	--- cmake/compiler.cmake.orig 2021-01-12 07:58:44 UTC
	2	+++ cmake/compiler.cmake
	3	@@ -41,6 +41,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
	4	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_ASSERTIONS")
	5	# Enable debug sync points
	6	add_definitions(-DGU_DBUG_ON)
	7	+else()
	8	+ # Due to liberal use of assert() in some modules, make sure that
	9	+ # non-debug builds have -DNDEBUG enabled.
	10	+ add_definitions(-DNDEBUG)
	11	endif()
	12
	13	if (GALERA_GU_DEBUG_MUTEX)

Lines 1-16 Link Here

(-)files/patch-galerautils_src_gu__crc32c__arm64.c (-5 / +6 lines)
1	--- galerautils/src/gu_crc32c_arm64.c.orig 2020-10-27 20:24:41 UTC	1	--- galerautils/src/gu_crc32c_arm64.c.orig 2020-12-29 15:10:20 UTC
2	+++ galerautils/src/gu_crc32c_arm64.c	2	+++ galerautils/src/gu_crc32c_arm64.c
3	@@ -74,7 +74,13 @@ gu_crc32c_arm64(gu_crc32c_t state, const void* data, s	3	@@ -83,7 +83,13 @@ gu_crc32c_func_t
4	gu_crc32c_func_t
5	gu_crc32c_hardware()	4	gu_crc32c_hardware()
6	{	5	{
		6	#if defined(GU_AT_HWCAP)
		7	- unsigned long int const hwcaps = getauxval(GU_AT_HWCAP);
7	+#if defined(__linux__)	8	+#if defined(__linux__)
8	unsigned long int const hwcaps = getauxval(AT_HWCAP);	9	+ unsigned long int const hwcaps = getauxval(AT_HWCAP);
9	+#endif	10	+#endif
10	+#if defined(__FreeBSD__)	11	+#if defined(__FreeBSD__)
11	+ unsigned long hwcaps;	12	+ unsigned long hwcaps;
12	+ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps));	13	+ elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps));
13	+#endif	14	+#endif
14	if (hwcaps & HWCAP_CRC32)	15	if (hwcaps & GU_HWCAP_CRC32)
15	{	16	{
16	gu_info ("CRC-32C: using hardware acceleration.");	17	gu_info ("CRC-32C: using hardware acceleration.");

Line 0 Link Here

(-)files/patch-garb_CMakeLists.txt (+24 lines)
	1	--- garb/CMakeLists.txt.orig 2021-01-08 11:51:42 UTC
	2	+++ garb/CMakeLists.txt
	3	@@ -32,11 +32,13 @@ target_link_libraries(garbd gcs4garb gcomm gcache
	4	${Boost_PROGRAM_OPTIONS_LIBRARIES})
	5
	6	install(TARGETS garbd DESTINATION bin)
	7	-install(FILES
	8	- ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
	9	- ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
	10	- ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
	11	- DESTINATION share)
	12	-install(FILES
	13	- ${CMAKE_SOURCE_DIR}/man/garbd.8
	14	- DESTINATION man/man8)
	15	+if (NOT CMAKE_SYSTEM MATCHES ".*BSD")
	16	+ install(FILES
	17	+ ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.cnf
	18	+ ${CMAKE_CURRENT_SOURCE_DIR}/files/garb.service
	19	+ ${CMAKE_CURRENT_SOURCE_DIR}/files/garb-systemd
	20	+ DESTINATION share)
	21	+ install(FILES
	22	+ ${CMAKE_SOURCE_DIR}/man/garbd.8
	23	+ DESTINATION man/man8)
	24	+endif()