Skip to content

Commit

Permalink
devel/meson: temporarily disable ldconfig after 665e4e5
Browse files Browse the repository at this point in the history
$ 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
  • Loading branch information
jbeich committed Nov 21, 2021
1 parent 8ab11c7 commit 51c83df
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions devel/meson/Makefile
Expand Up @@ -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}/

Expand Down
16 changes: 16 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion multimedia/handbrake/Makefile
Expand Up @@ -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
Expand Down

0 comments on commit 51c83df

Please sign in to comment.