Skip to content

Commit

Permalink
Enable hardcoding runpaths for more platforms and allow Solaris' patc…
Browse files Browse the repository at this point in the history
…h to run

buildconf.
  • Loading branch information
Sascha Schumann committed Oct 6, 1999
1 parent 1606365 commit 966b87e
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 2 deletions.
3 changes: 2 additions & 1 deletion buildconf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
61 changes: 60 additions & 1 deletion patch-aa
Original file line number Diff line number Diff line change
@@ -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 ****

Expand All @@ -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

0 comments on commit 966b87e

Please sign in to comment.