diff options
| author | Sascha Schumann <sas@php.net> | 1999-10-06 23:26:36 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-10-06 23:26:36 +0000 |
| commit | 966b87e814e52c584dfa4f4ccdedd202c4969610 (patch) | |
| tree | 50f9f0c4fc1c169c1d1e827ebd30c0de3c9f9e06 /patch-aa | |
| parent | 1606365a121c36d8d2410a7d3847290da74fb113 (diff) | |
| download | php-git-966b87e814e52c584dfa4f4ccdedd202c4969610.tar.gz | |
Enable hardcoding runpaths for more platforms and allow Solaris' patch to run
buildconf.
Diffstat (limited to 'patch-aa')
| -rw-r--r-- | patch-aa | 61 |
1 files changed, 60 insertions, 1 deletions
@@ -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 |