From nobody Sun Nov 21 11:07:21 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0AD7E189DA7A; Sun, 21 Nov 2021 11:07:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hxnfx6sbXz4h5c; Sun, 21 Nov 2021 11:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5F29651A; Sun, 21 Nov 2021 11:07:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ALB7LsW097468; Sun, 21 Nov 2021 11:07:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ALB7LKY097467; Sun, 21 Nov 2021 11:07:21 GMT (envelope-from git) Date: Sun, 21 Nov 2021 11:07:21 GMT Message-Id: <202111211107.1ALB7LKY097467@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 51c83df293e0 - main - devel/meson: temporarily disable ldconfig after 665e4e5edb6d List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51c83df293e0770cfb9778b53d55149fa3d27b3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=51c83df293e0770cfb9778b53d55149fa3d27b3f commit 51c83df293e0770cfb9778b53d55149fa3d27b3f Author: Jan Beich AuthorDate: 2021-11-19 04:06:57 +0000 Commit: Jan Beich 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