git: 51c83df293e0 - main - devel/meson: temporarily disable ldconfig after 665e4e5edb6d

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=51c83df293e0770cfb9778b53d55149fa3d27b3f

commit 51c83df293e0770cfb9778b53d55149fa3d27b3f
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-19 04:06:57 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-21 11:06:33 +0000

    devel/meson: temporarily disable ldconfig after 665e4e5edb6d
    
    $ su root -c 'meson install -C foo_build'
    $ meson
    ld-elf.so.1: Shared object "libpython3.8.so.1.0" not found, required by "python3.8"
    
    PR:             259080
---
 devel/meson/Makefile                           |  1 +
 devel/meson/files/patch-mesonbuild_minstall.py | 16 ++++++++++++++++
 multimedia/handbrake/Makefile                  |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/devel/meson/Makefile b/devel/meson/Makefile
index 57995f9c2fec..43b3469b333f 100644
--- a/devel/meson/Makefile
+++ b/devel/meson/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	meson
 PORTVERSION=	0.60.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
 
diff --git a/devel/meson/files/patch-mesonbuild_minstall.py b/devel/meson/files/patch-mesonbuild_minstall.py
new file mode 100644
index 000000000000..cca3919c2978
--- /dev/null
+++ b/devel/meson/files/patch-mesonbuild_minstall.py
@@ -0,0 +1,16 @@
+https://github.com/mesonbuild/meson/issues/9592
+
+--- mesonbuild/minstall.py.orig	2021-11-02 19:58:13 UTC
++++ mesonbuild/minstall.py
+@@ -247,6 +247,11 @@ def apply_ldconfig(dm: DirMaker) -> None:
+     '''
+     Apply ldconfig to update the ld.so.cache.
+     '''
++    from .mesonlib import is_linux
++    if not is_linux():
++        # Don't blindly assume GNU semantics on other systems
++        return
++
+     if not shutil.which('ldconfig'):
+         # If we don't have ldconfig, failure is ignored quietly.
+         return
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index a8a3a2b6db59..b49af93efa8f 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -63,7 +63,7 @@ LIB_DEPENDS+=	libdvdcss.so:multimedia/libdvdcss
 GNU_CONFIGURE=	yes
 MAKE_ENV=	V=1 ACLOCAL=${LOCALBASE}/bin/aclocal
 
-BINARY_ALIAS=	python3=${PYTHON_VERSION} ldconfig=${FALSE}
+BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 CONFIGURE_ARGS=	--force --enable-x265
 CONFIGURE_TARGET=	build