From 3b142951766c96626786c8e65cc87c1aed0b6818 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Sep 2017 12:12:08 +0200
Subject: Adjust haiku configuration of upstream libtool for packaging.


diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3bc337..1885e22 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2709,8 +2709,9 @@ haiku*)
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LIBRARY_PATH
   shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
+  sys_lib_search_path_spec='/boot/system/non-packaged/develop/lib /boot/system/develop/lib'
+  sys_lib_dlsearch_path_spec='/boot/home/config/non-packaged/lib /boot/home/config/lib /boot/system/non-packaged/lib /boot/system/lib'
+  hardcode_into_libs=no
   ;;
 
 hpux9* | hpux10* | hpux11*)
-- 
2.26.0


From f9239bc54a5c90cd2ef7dbebf94e8eb4d5f3a454 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 11 Apr 2020 21:12:42 +0200
Subject: Do not explicitly link dependencies on Haiku.

This is not needed, the runtime_loader can figure them out.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 1885e22..667d45e 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -5128,7 +5128,7 @@ _LT_EOF
 
     haiku*)
       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=no
       ;;
 
     os2*)
@@ -6769,7 +6769,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 
       haiku*)
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(link_all_deplibs, $1)=no
         ;;
 
       hpux9*)
-- 
2.26.0

