Re: UPDATE: fio
Stuart Henderson <[email protected]>
| Newsgroups | gmane.os.openbsd.ports |
|---|---|
| Message-ID | <[email protected]> |
On 2026/08/08 19:34, Brad Smith wrote:
> Remove a hack hardcoding a dependency on GnuTLS that is only relevant
> for Linux.
>
makes sense - any objections, Kurt?
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/benchmarks/fio/Makefile,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 Makefile
> --- Makefile 28 Dec 2025 05:34:39 -0000 1.13
> +++ Makefile 8 Aug 2026 23:28:51 -0000
> @@ -4,6 +4,7 @@ GH_ACCOUNT= axboe
> GH_PROJECT= fio
> GH_TAGNAME= fio-3.41
> PKGNAME= ${GH_TAGNAME}
> +REVISION= 0
>
> CATEGORIES= benchmarks
>
> @@ -19,7 +20,7 @@ PERMIT_PACKAGE= Yes
> COMPILER= base-clang ports-gcc
> COMPILER_LANGS= c
>
> -WANTLIB += c gnutls m nfs pthread z
> +WANTLIB += c m nfs pthread z
>
> USE_GMAKE= Yes
> SEPARATE_BUILD= Yes
> @@ -32,7 +33,6 @@ MAKE_FLAGS= V=1 \
> CONFIGURE_ARGS= --disable-optimizations \
> --disable-native
>
> -LIB_DEPENDS= devel/libnfs \
> - security/gnutls
> +LIB_DEPENDS= devel/libnfs
>
> .include <bsd.port.mk>
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-configure 8 Aug 2026 23:28:51 -0000
> @@ -0,0 +1,21 @@
> +GnuTLS is Linux-specific.
> +
> +Index: configure
> +--- configure.orig
> ++++ configure
> +@@ -2363,8 +2363,13 @@ print_config "DAOS File System (dfs) Engine" "$dfs"
> + if test "$libnfs" != "no" ; then
> + if $(pkg-config libnfs > /dev/null 2>&1); then
> + libnfs="yes"
> +- libnfs_cflags=$(pkg-config --cflags libnfs gnutls)
> +- libnfs_libs=$(pkg-config --libs libnfs gnutls)
> ++ if test "$targetos" = "Linux" ; then
> ++ libnfs_cflags=$(pkg-config --cflags libnfs gnutls)
> ++ libnfs_libs=$(pkg-config --libs libnfs gnutls)
> ++ else
> ++ libnfs_cflags=$(pkg-config --cflags libnfs)
> ++ libnfs_libs=$(pkg-config --libs libnfs)
> ++ fi
> + else
> + if test "$libnfs" = "yes" ; then
> + feature_not_found "libnfs" "libnfs"
>