Enable hardcoding runpaths for more platforms and allow Solaris' patch to run

buildconf.

diff --git a/buildconf b/buildconf
index ac88e68feab5d47a4190147ca034931df9324d49..39c3800e1b6a533f9763588372811a0b1e7c4c1c 100755 (executable)
--- a/buildconf
+++ b/buildconf
@@ -116,7 +116,8 @@ fi
 
 rm -f ltmain.sh ltconfig
 libtoolize --automake --copy --force
-cat patch-?? | patch -N
+patch ltconfig < patch-aa
+patch ltmain.sh < patch-ab
 
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal

diff --git a/patch-aa b/patch-aa
index 348bfb1a65f2c56b614e077a0661dd13d5db9932..ba55ba089009f157bd4476f360913eb591b5de08 100644 (file)
--- a/patch-aa
+++ b/patch-aa
@@ -1,5 +1,43 @@
 *** /usr/local/share/libtool/ltconfig  Wed Jul 14 14:46:28 1999
---- ltconfig   Wed Oct  6 20:32:14 1999
+--- ltconfig   Thu Oct  7 01:23:18 1999
+***************
+*** 1188,1195 ****
+  
+    netbsd*)
+      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+!       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+!       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+        # can we support soname and/or expsyms with a.out? -oliva
+--- 1188,1195 ----
+  
+    netbsd*)
+      if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+!       archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+!       archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
+        # can we support soname and/or expsyms with a.out? -oliva
+***************
+*** 1210,1217 ****
+  
+  EOF
+      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+!       archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+!       archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        ld_shlibs=no
+      fi
+--- 1210,1217 ----
+  
+  EOF
+      elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+!       archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+!       archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+        ld_shlibs=no
+      fi
 ***************
 *** 1226,1233 ****
   
@@ -19,3 +57,24 @@
       else
         ld_shlibs=no
       fi
+***************
+*** 1428,1436 ****
+      no_undefined_flag=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+!     archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
+      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+!              $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case "$host_os" in
+--- 1428,1436 ----
+      no_undefined_flag=' -z text'
+      # $CC -shared without GNU ld will not create a library from C++
+      # object files and a static libstdc++, better avoid it by now
+!     archive_cmds='$LD $compile_rpath -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
+      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+!              $LD $compile_rpath -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_shlibpath_var=no
+      case "$host_os" in