Merge pull request pistacheio#1246 from dgreatwood/MakeDlLibraryDepen…

…dency2 Fix: Improved Fix For Issue When dladdr not in libc
dgreatwood · Sep 30, 2024 · bbc7015 · bbc7015
2 parents e07dc0b + e9cb3a5
commit bbc7015
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/meson.build b/meson.build
@@ -154,7 +154,15 @@ endif
 # #1230.
 # Note: If 'dl' is not available, per Meson it suggests that the
 # functionality is provided by libc
-deps_libpistache += dependency('dl', required: false)
+has_dladdr_func = compiler.has_function('dladdr')
+if not has_dladdr_func
+  libdl_dep += dependency('dl')
+  has_dladdr_func = compiler.has_function('dladdr', dependencies: libdl_dep)
+  if not has_dladdr_func
+    warning('Unable to find dladdr(), even when trying to link to libdl')
+  endif
+  libpistache_deps += libdl_dep
+endif
 
 version_array = []
 if meson.version().version_compare('>=0.57.0')

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.4.6.20240919
+0.4.7.20240930