[libbluray-devel] [Git][videolan/libbluray][master] build: fix dlfcn, sys/dl.h checks

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / libbluray


Commits:
4cc7e7ec by Sam James at 2025-07-10T05:11:04+01:00
build: fix dlfcn, sys/dl.h checks

We had a bug report downstream in Gentoo of a build failure on musl
systems (https://bugs.gentoo.org/958375). It turns out that nothing
defines HAVE_DLFCN_H or HAVE_DLFCN_H in configure.ac, and the logic
in meson.build isn't ideal either.

Fix that by:
* Looking for dlfcn.h, sys/dl.h in the autotools build
* Check for dlfcn.h rather than assuming in the Meson build
* Look for sys/dl.h in the Meson build as well

- - - - -


2 changed files:

- configure.ac
- meson.build


Changes:

=====================================
configure.ac
=====================================
@@ -147,7 +147,7 @@ LT_INIT
 dnl required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
 AC_CHECK_HEADERS([stdlib.h mntent.h inttypes.h strings.h])
-AC_CHECK_HEADERS([sys/time.h time.h mntent.h])
+AC_CHECK_HEADERS([dlfcn.h sys/dl.h sys/time.h time.h mntent.h])
 
 dnl required structures
 AC_STRUCT_DIRENT_D_TYPE


=====================================
meson.build
=====================================
@@ -114,9 +114,11 @@ endif
 
 check_headers = [
     'dirent.h',
+    'dlfcn.h',
     'mntent.h',
     'strings.h',
     'sys/time.h',
+    'sys/dl.h',
 ]
 
 foreach h : check_headers
@@ -153,7 +155,6 @@ else
         libdl_dependency = cc.find_library('dl')
     endif
     thread_dependency = dependency('threads')
-    cdata.set('HAVE_DLFCN_H', 1)
     cdata.set('HAVE_PTHREAD_H', 1)
 endif
 



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/4cc7e7ec4730f56e76902a7abe5b3d7f19a1109d

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/commit/4cc7e7ec4730f56e76902a7abe5b3d7f19a1109d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance