Attachment #252225 for bug #280409

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




PORTNAME=	pgbackrest
DISTVERSIONPREFIX=	release/
DISTVERSION=	2.53
CATEGORIES=	databases

MAINTAINER=	schoutm@gmail.com


BINARY_ALIAS=	python3=${PYTHON_CMD}

OPTIONS_DEFINE=		SFTP ZSTD
OPTIONS_DEFAULT=	LZ4

SFTP_DESC=	Enable SFTP storage support

LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
LZ4_MESON_ON=		-Dliblz4=enabled
LZ4_MESON_OFF=		-Dliblz4=disabled

SFTP_LIB_DEPENDS=	libssh2.so:security/libssh2
SFTP_MESON_ON=		-Dlibssh2=enabled
SFTP_MESON_OFF=		-Dlibssh2=disabled

Lines 1-3 Link Here

(-)b/databases/pgbackrest/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1712155789	1	TIMESTAMP = 1721657675
2	SHA256 (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 9fa6760032927de448251fb1e5b824e2d17caf560796e74947275b72dc20ed2a	2	SHA256 (pgbackrest-pgbackrest-release-2.53_GH0.tar.gz) = cbb4fd81729dc3b562fd0f0a3c0dbf39f8b97b8140de9898bc8d2a19884b7a12
3	SIZE (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 6119922	3	SIZE (pgbackrest-pgbackrest-release-2.53_GH0.tar.gz) = 2693089




--- meson.build.orig	2024-04-10 11:23:05 UTC
+++ meson.build
@@ -144,7 +144,7 @@ lib_bz2 = cc.find_library('bz2')
 lib_bz2 = cc.find_library('bz2')
 
 # Find optional lz4 library
-lib_lz4 = dependency('liblz4', required: false)
+lib_lz4 = dependency('liblz4', required: get_option('liblz4'))
 
 if lib_lz4.found()
     configuration.set('HAVE_LIBLZ4', true, description: 'Is liblz4 present?')
@@ -168,14 +168,14 @@ configuration.set('ZLIB_CONST', true, description: 'Re
 configuration.set('ZLIB_CONST', true, description: 'Require zlib const input buffer')
 
 # Find optional libssh2 library
-lib_ssh2 = dependency('libssh2', required: false)
+lib_ssh2 = dependency('libssh2', required: get_option('libssh2'))
 
 if lib_ssh2.found()
     configuration.set('HAVE_LIBSSH2', true, description: 'Is libssh2 present?')
 endif
 
 # Find optional zstd library
-lib_zstd = dependency('libzstd', version: '>=1.0', required: false)
+lib_zstd = dependency('libzstd', version: '>=1.0', required: get_option('libzstd'))
 
 if lib_zstd.found()
     configuration.set('HAVE_LIBZST', true, description: 'Is libzstd present?')

Removed Link Here

(-)a/databases/pgbackrest/files/patch-meson__options.txt (-8 lines)
1	--- meson_options.txt.orig 2024-03-24 20:53:22 UTC
2	+++ meson_options.txt
3	@@ -1,2 +1,5 @@ option('fatal-errors', type: 'boolean', value: false,
4	option('configdir', type: 'string', value: '/etc/pgbackrest', description: 'Configuration directory')
5	option('fatal-errors', type: 'boolean', value: false, description: 'Stop compilation on first error')
6	+option('liblz4', type: 'feature', value: 'auto', description: 'Enable LZ4 compression support')
7	+option('libssh2', type: 'feature', value: 'auto', description: 'Enable SFTP storage support')
8	+option('libzstd', type: 'feature', value: 'auto', description: 'Enable Zstandard compression support')

Removed Link Here

(-)a/databases/pgbackrest/files/patch-src_meson.build (-10 lines)
1	--- src/meson.build.orig 2024-03-24 20:53:22 UTC
2	+++ src/meson.build
3	@@ -284,5 +284,6 @@ executable(
4	lib_xml,
5	lib_z,
6	lib_zstd,
7	- ]
8	+ ],
9	+ install: true,
10	)

Return to bug 280409

Lines 1-6 Link Here

(-)b/databases/pgbackrest/Makefile (-7 / +2 lines)
1	PORTNAME= pgbackrest	1	PORTNAME= pgbackrest
2	DISTVERSIONPREFIX= release/	2	DISTVERSIONPREFIX= release/
3	DISTVERSION= 2.51	3	DISTVERSION= 2.53
4	CATEGORIES= databases	4	CATEGORIES= databases
5		5
6	MAINTAINER= schoutm@gmail.com	6	MAINTAINER= schoutm@gmail.com
Lines 21-35 MESON_ARGS+= -Dconfigdir="${LOCALBASE}/etc/pgbackrest" Link Here
21		21
22	BINARY_ALIAS= python3=${PYTHON_CMD}	22	BINARY_ALIAS= python3=${PYTHON_CMD}
23		23
24	OPTIONS_DEFINE= LZ4 SFTP ZSTD	24	OPTIONS_DEFINE= SFTP ZSTD
25	OPTIONS_DEFAULT= LZ4
26		25
27	SFTP_DESC= Enable SFTP storage support	26	SFTP_DESC= Enable SFTP storage support
28		27
29	LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4
30	LZ4_MESON_ON= -Dliblz4=enabled
31	LZ4_MESON_OFF= -Dliblz4=disabled
32
33	SFTP_LIB_DEPENDS= libssh2.so:security/libssh2	28	SFTP_LIB_DEPENDS= libssh2.so:security/libssh2
34	SFTP_MESON_ON= -Dlibssh2=enabled	29	SFTP_MESON_ON= -Dlibssh2=enabled
35	SFTP_MESON_OFF= -Dlibssh2=disabled	30	SFTP_MESON_OFF= -Dlibssh2=disabled

Removed Link Here

(-)a/databases/pgbackrest/files/patch-meson.build (-28 lines)
1	--- meson.build.orig 2024-04-10 11:23:05 UTC
2	+++ meson.build
3	@@ -144,7 +144,7 @@ lib_bz2 = cc.find_library('bz2')
4	lib_bz2 = cc.find_library('bz2')
5
6	# Find optional lz4 library
7	-lib_lz4 = dependency('liblz4', required: false)
8	+lib_lz4 = dependency('liblz4', required: get_option('liblz4'))
9
10	if lib_lz4.found()
11	configuration.set('HAVE_LIBLZ4', true, description: 'Is liblz4 present?')
12	@@ -168,14 +168,14 @@ configuration.set('ZLIB_CONST', true, description: 'Re
13	configuration.set('ZLIB_CONST', true, description: 'Require zlib const input buffer')
14
15	# Find optional libssh2 library
16	-lib_ssh2 = dependency('libssh2', required: false)
17	+lib_ssh2 = dependency('libssh2', required: get_option('libssh2'))
18
19	if lib_ssh2.found()
20	configuration.set('HAVE_LIBSSH2', true, description: 'Is libssh2 present?')
21	endif
22
23	# Find optional zstd library
24	-lib_zstd = dependency('libzstd', version: '>=1.0', required: false)
25	+lib_zstd = dependency('libzstd', version: '>=1.0', required: get_option('libzstd'))
26
27	if lib_zstd.found()
28	configuration.set('HAVE_LIBZST', true, description: 'Is libzstd present?')