cvs: /php4 buildconf patch-aa

sas Wed Oct 6 19:27:06 1999 EDT Modified files: /php4 buildconf patch-aa Log: Enable hardcoding runpaths for more platforms and allow Solaris' patch to run buildconf. Index: php4/buildconf diff -u php4/buildconf:1.40 php4/buildconf:1.41 --- php4/buildconf:1.40 Wed Oct 6 15:34:36 1999 +++ php4/buildconf Wed Oct 6 19:26:35 1999 @@ -116,7 +116,8 @@ 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 Index: php4/patch-aa diff -u php4/patch-aa:1.1 php4/patch-aa:1.2 --- php4/patch-aa:1.1 Wed Oct 6 14:58:14 1999 +++ php4/patch-aa Wed Oct 6 19:26:36 1999 @@ -1,6 +1,44 @@ *** /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