Date: Sat, 20 Feb 2021 00:35:19 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566126 - in head/sysutils: bareos-client bareos-server bareos-server/files Message-ID: <202102200035.11K0ZJxF029894@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sat Feb 20 00:35:19 2021 New Revision: 566126 URL: https://svnweb.freebsd.org/changeset/ports/566126 Log: - Fix build on 13/14 [1] - Now LMDB support is not optional in bareos-client port. It is compiled by default - Add LMDB OPTION into bareos-server port PR: 252917 Submitted by: Trond.Endrestol at ximalas.info [1] Modified: head/sysutils/bareos-client/Makefile head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt head/sysutils/bareos-server/pkg-plist.client Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Sat Feb 20 00:28:57 2021 (r566125) +++ head/sysutils/bareos-client/Makefile Sat Feb 20 00:35:19 2021 (r566126) @@ -15,11 +15,10 @@ MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS -OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO +OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO CEPHFS_DESC= CEPHFS fd plugin support GFAPI_DESC= GFAPI fd plugin support RADOS_DESC= RADOS fd plugin support -LMDB_DESC= Enable build of LMDB support .include "${MASTERDIR}/Makefile" Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Sat Feb 20 00:28:57 2021 (r566125) +++ head/sysutils/bareos-server/Makefile Sat Feb 20 00:35:19 2021 (r566126) @@ -3,7 +3,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ DISTVERSION= 20.0.0 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -48,14 +48,15 @@ SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "-server" OPTIONS_GROUP= BACKENDS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS -OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO -OPTIONS_DEFAULT+= PGSQL SCSICRYPTO +OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO +OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support +LMDB_DESC= Enable faster accurate backup support RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON @@ -114,18 +115,20 @@ CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dpiddir=/var/run/bareos .if defined(WITH_CLIENT_ONLY) +CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 + +CMAKE_ARGS+= -Dfd-user=root \ + -Dfd-group=wheel \ + -Dlmdb=ON +.else LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 -CMAKE_ARGS+= -Dfd-user=root \ - -Dfd-group=wheel -.else CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ - -Dsd-group=operator \ - -Dlmdb=OFF + -Dsd-group=operator .endif # The user/group IDs below are registered, see Modified: head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt Sat Feb 20 00:28:57 2021 (r566125) +++ head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt Sat Feb 20 00:35:19 2021 (r566126) @@ -1,5 +1,5 @@ --- core/src/stored/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2020-12-23 23:06:49.516519000 -0500 ++++ core/src/stored/CMakeLists.txt 2021-02-19 16:15:32.925944000 -0500 @@ -226,23 +226,23 @@ list(APPEND BAREOS_SD_LIBRARIES comctl32) endif() @@ -8,14 +8,16 @@ +target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bls ${BLSSRCS}) - target_link_libraries(bls bareos bareossd bareosfind) +-target_link_libraries(bls bareos bareossd bareosfind) ++target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES}) add_executable(bextract ${BEXTRACTSRS}) -target_link_libraries(bextract bareossd bareosfind bareos) +target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bscan ${BSCANSRCS}) - target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) +-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) ++target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES}) add_executable(btape ${BTAPESRCS}) -target_link_libraries(btape bareossd bareos) Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Sat Feb 20 00:28:57 2021 (r566125) +++ head/sysutils/bareos-server/pkg-plist.client Sat Feb 20 00:35:19 2021 (r566126) @@ -58,9 +58,9 @@ lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so lib/libbareosfind.so.20 lib/libbareosfind.so.%%LIB_VERSION%% -%%LMDB%%lib/libbareoslmdb.so -%%LMDB%%lib/libbareoslmdb.so.20 -%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% +lib/libbareoslmdb.so +lib/libbareoslmdb.so.20 +lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd.so man/man1/bconsole.1.gz man/man8/bareos-fd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102200035.11K0ZJxF029894>