sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build on 13/14 [1]

Browse source 
- 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]
This commit is contained in:
Jose Alonso Cardenas Marquez 2021-02-20 00:35:19 +00:00
parent 8a1ef6c707
commit af64b27ae4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=566126
4 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/bareos-client/Makefile
View file

@ -15,11 +15,10 @@ MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
OPTIONS_GROUP= PLUGINS OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO
CEPHFS_DESC= CEPHFS fd plugin support CEPHFS_DESC= CEPHFS fd plugin support
GFAPI_DESC= GFAPI fd plugin support GFAPI_DESC= GFAPI fd plugin support
RADOS_DESC= RADOS fd plugin support RADOS_DESC= RADOS fd plugin support
LMDB_DESC= Enable build of LMDB support
.include "${MASTERDIR}/Makefile" .include "${MASTERDIR}/Makefile"

19
sysutils/bareos-server/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= bareos PORTNAME= bareos
DISTVERSIONPREFIX= Release/ DISTVERSIONPREFIX= Release/
DISTVERSION= 20.0.0 DISTVERSION= 20.0.0
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES?= sysutils CATEGORIES?= sysutils
PKGNAMEPREFIX?= # PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server PKGNAMESUFFIX?= -server
@ -48,14 +48,15 @@ SCSICRYPTO_DESC= Build LTO AME crypto plugin
.if ${PKGNAMESUFFIX} == "-server" .if ${PKGNAMESUFFIX} == "-server"
OPTIONS_GROUP= BACKENDS OPTIONS_GROUP= BACKENDS
OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO
OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO
OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
OPTIONS_SINGLE+= DATABASE OPTIONS_SINGLE+= DATABASE
BACKENDS_DESC= Storage backends BACKENDS_DESC= Storage backends
DATABASE_DESC= Database support DATABASE_DESC= Database support
CEPHFS_DESC= CEPHFS backend support CEPHFS_DESC= CEPHFS backend support
GFAPI_DESC= GFAPI backend support GFAPI_DESC= GFAPI backend support
LMDB_DESC= Enable faster accurate backup support
RADOS_DESC= RADOS backend support RADOS_DESC= RADOS backend support
NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_ON= -Dndmp=ON
@ -114,18 +115,20 @@ CMAKE_ARGS+= -Dtcp-wrappers=ON \
-Dpiddir=/var/run/bareos -Dpiddir=/var/run/bareos
.if defined(WITH_CLIENT_ONLY) .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_ON= -Dlmdb=ON
LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CMAKE_OFF= -Dlmdb=OFF
LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 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} \ CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \
-Ddir-group=${BAREOS_GROUP} \ -Ddir-group=${BAREOS_GROUP} \
-Dsd-user=${BAREOS_USER} \ -Dsd-user=${BAREOS_USER} \
-Dsd-group=operator \ -Dsd-group=operator
-Dlmdb=OFF
.endif .endif
# The user/group IDs below are registered, see # The user/group IDs below are registered, see

8
sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt
View file

@ -1,5 +1,5 @@
--- core/src/stored/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 --- 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 @@ @@ -226,23 +226,23 @@
list(APPEND BAREOS_SD_LIBRARIES comctl32) list(APPEND BAREOS_SD_LIBRARIES comctl32)
endif() endif()
@ -8,14 +8,16 @@
+target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) +target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
add_executable(bls ${BLSSRCS}) 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}) add_executable(bextract ${BEXTRACTSRS})
-target_link_libraries(bextract bareossd bareosfind bareos) -target_link_libraries(bextract bareossd bareosfind bareos)
+target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) +target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
add_executable(bscan ${BSCANSRCS}) 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}) add_executable(btape ${BTAPESRCS})
-target_link_libraries(btape bareossd bareos) -target_link_libraries(btape bareossd bareos)

6
sysutils/bareos-server/pkg-plist.client
View file

@ -58,9 +58,9 @@ lib/libbareosfastlz.so.%%LIB_VERSION%%
lib/libbareosfind.so lib/libbareosfind.so
lib/libbareosfind.so.20 lib/libbareosfind.so.20
lib/libbareosfind.so.%%LIB_VERSION%% lib/libbareosfind.so.%%LIB_VERSION%%
%%LMDB%%lib/libbareoslmdb.so lib/libbareoslmdb.so
%%LMDB%%lib/libbareoslmdb.so.20 lib/libbareoslmdb.so.20
%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% lib/libbareoslmdb.so.%%LIB_VERSION%%
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd.so
man/man1/bconsole.1.gz man/man1/bconsole.1.gz
man/man8/bareos-fd.8.gz man/man8/bareos-fd.8.gz