Attachment 249860 Details for Bug 276559 – Explicitly disable deps that are turned off, switch to meson builds, update to v2.51

[patch] Explicitly disable deps that are turned off, switch to meson builds, update to v2.51

pgbackrest-2.51-2024-04-09.patch (text/plain), 5.10 KB, created by Michael Schout on 2024-04-09 19:21:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Schout

Created: 2024-04-09 19:21:35 UTC

Size: 5.10 KB

patch

obsolete

>diff -uNr databases/pgbackrest.orig/Makefile databases/pgbackrest/Makefile
>--- databases/pgbackrest.orig/Makefile	2024-04-03 09:49:28.739004000 -0500
>+++ databases/pgbackrest/Makefile	2024-04-09 14:19:03.544948000 -0500
>@@ -1,6 +1,6 @@
> PORTNAME=	pgbackrest
> DISTVERSIONPREFIX=	release/
>-DISTVERSION=	2.49
>+DISTVERSION=	2.51
> CATEGORIES=	databases
> 
> MAINTAINER=	schoutm@gmail.com
>@@ -8,31 +8,36 @@
> WWW=		https://pgbackrest.org/
> 
> LICENSE=	MIT
>-LICENSE_FILE=	${WRKSRC}/../LICENSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
> 		libyaml.so:textproc/libyaml
> 
>-USES=		gmake gnome pkgconfig pgsql ssl
>+USES=		gnome meson pgsql pkgconfig python ssl
>+USE_GITHUB=	yes
> USE_GNOME=	libxml2
>-GNU_CONFIGURE=	yes
> 
>-USE_GITHUB=	yes
>+MESON_ARGS+=	-Dconfigdir="${LOCALBASE}/etc/pgbackrest"
> 
>-WRKSRC_SUBDIR=	src
>+OPTIONS_DEFINE=		LZ4 SSH ZSTD
>+OPTIONS_DEFAULT=	LZ4
> 
>-ALL_TARGET=
>+LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
>+LZ4_MESON_ON=		-Dliblz4=enabled
>+LZ4_MESON_OFF=		-Dliblz4=disabled
> 
>-CONFIGURE_ARGS=	--with-configdir="${LOCALBASE}/etc/pgbackrest"
>+SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
>+SSH_MESON_ON=		-Dlibssh2=enabled
>+SSH_MESON_OFF=		-Dlibssh2=disabled
> 
>-OPTIONS_DEFINE=	ZSTD
>-
> ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
>-ZSTD_CONFIGURE_OFF=	ac_cv_lib_zstd_ZSTD_isError=no
>-ZSTD_CONFIGURE_ON=	ac_cv_lib_zstd_ZSTD_isError=yes
>+ZSTD_MESON_ON=		-Dlibzstd=enabled
>+ZSTD_MESON_OFF=		-Dlibzstd=disabled
> 
>+post-patch:
>+	${SED} -i -e "s@'python3'@'${PYTHON_CMD}'@" ${WRKSRC}/meson.build
>+
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgbackrest
> 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pgbackrest
> 
> .include <bsd.port.mk>
>diff -uNr databases/pgbackrest.orig/distinfo databases/pgbackrest/distinfo
>--- databases/pgbackrest.orig/distinfo	2024-04-03 09:49:28.739174000 -0500
>+++ databases/pgbackrest/distinfo	2024-04-03 09:49:49.368991000 -0500
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1704919820
>-SHA256 (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 32a2d1bd504cc13f6e01533811104da39e2e842cdd8a7ba87293021cf03162f3
>-SIZE (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 6162457
>+TIMESTAMP = 1712155789
>+SHA256 (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 9fa6760032927de448251fb1e5b824e2d17caf560796e74947275b72dc20ed2a
>+SIZE (pgbackrest-pgbackrest-release-2.51_GH0.tar.gz) = 6119922
>diff -uNr databases/pgbackrest.orig/files/patch-meson.build databases/pgbackrest/files/patch-meson.build
>--- databases/pgbackrest.orig/files/patch-meson.build	1969-12-31 18:00:00.000000000 -0600
>+++ databases/pgbackrest/files/patch-meson.build	2024-04-09 13:50:14.900123000 -0500
>@@ -0,0 +1,28 @@
>+--- meson.build.orig	2024-04-09 18:49:34 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?')
>diff -uNr databases/pgbackrest.orig/files/patch-meson__options.txt databases/pgbackrest/files/patch-meson__options.txt
>--- databases/pgbackrest.orig/files/patch-meson__options.txt	1969-12-31 18:00:00.000000000 -0600
>+++ databases/pgbackrest/files/patch-meson__options.txt	2024-04-09 13:50:14.901606000 -0500
>@@ -0,0 +1,8 @@
>+--- meson_options.txt.orig	2024-03-24 20:53:22 UTC
>++++ meson_options.txt
>+@@ -1,2 +1,5 @@ option('fatal-errors', type: 'boolean', value: false, 
>+ option('configdir', type: 'string', value: '/etc/pgbackrest', description: 'Configuration directory')
>+ option('fatal-errors', type: 'boolean', value: false, description: 'Stop compilation on first error')
>++option('liblz4', type: 'feature', value: 'auto', description: 'Enable LZ4 support')
>++option('libssh2', type: 'feature', value: 'auto', description: 'Enable SSH/SFTP support')
>++option('libzstd', type: 'feature', value: 'auto', description: 'Enable ZSTD support')
>diff -uNr databases/pgbackrest.orig/files/patch-src_meson.build databases/pgbackrest/files/patch-src_meson.build
>--- databases/pgbackrest.orig/files/patch-src_meson.build	1969-12-31 18:00:00.000000000 -0600
>+++ databases/pgbackrest/files/patch-src_meson.build	2024-04-08 10:47:40.342972000 -0500
>@@ -0,0 +1,10 @@
>+--- src/meson.build.orig	2024-03-24 20:53:22 UTC
>++++ src/meson.build
>+@@ -284,5 +284,6 @@ executable(
>+         lib_xml,
>+         lib_z,
>+         lib_zstd,
>+-    ]
>++    ],
>++    install: true,
>+ )

Flags:

schoutm: maintainer-approval+

Actions: View | Diff

Attachments on bug 276559: 247893 | 249679 | 249837 | 249860 | 249876 | 249877 | 249878 | 249971 | 250182