ID: 50190 Updated by: j...@php.net Reported By: ralphdoncaster at gmail dot com -Status: Open +Status: Feedback Bug Type: Apache2 related Operating System: AIX 5.3 PHP Version: 5.2.11 New Comment:
I should have been more verbose I guess: I need diff -u (unified diff) and do NOT paste it here but in http://pastebin.com/ and provide the URL to the paste in this bug report. DO NOT EMAIL anything to me! Previous Comments: ------------------------------------------------------------------------ [2009-11-20 18:17:13] ralphdoncaster at gmail dot com OK, even though I think your're going about it the hard way (instead of just updating the included libtool to >+1.5.26) here's a regular diff (I'll email you it too): 7c7 < # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 --- > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 53c53 < build_libtool_libs=no --- > build_libtool_libs=yes 65c65 < fast_install=needless --- > fast_install=yes 68c68 < host_alias=powerpc-ibm-aix5.3.0.0 --- > host_alias= 86a87,89 > # LTCC compiler flags. > LTCFLAGS="-g -O2" > 94c97 < EGREP="grep -E" --- > EGREP="/usr/bin/grep -E" 147c150 < max_cmd_len=8192 --- > max_cmd_len=18432 171c174 < link_static_flag="-static" --- > link_static_flag="" 193c196 < library_names_spec="\${libname}\${release}.a \$libname.a" --- > library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" 196c199 < soname_spec="\${libname}\${release}\${shared_ext}\$major" --- > soname_spec="" 200,201c203,204 < old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib" < old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib" --- > old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" > old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib" 212c215 < archive_expsym_cmds="\$CC -shared -o \$output_objdir/\$soname \$libobjs \$deplibs \$compiler_flags \${wl}-bE:\$export_symbols \${wl}-bnoentry\${allow_undefined_flag}~\$AR \$AR_FLAGS \$output_objdir/\$libname\$release.a \$output_objdir/\$soname" --- > archive_expsym_cmds="\$CC -o \$output_objdir/\$soname \$libobjs \$deplibs \${wl}-bnoentry \$compiler_flags \\\`if test \\\"x\${allow_undefined_flag}\\\" != \\\"x\\\"; then echo \\\"\${wl}\${allow_undefined_flag}\\\"; else :; fi\\\` \${wl}-bexport:\$export_symbols -shared \${wl}-G" 239a243,246 > # The directories searched by this compiler when creating a shared > # library > compiler_lib_search_dirs="" > 251c258 < allow_undefined_flag=" \${wl}-berok" --- > allow_undefined_flag="-berok" 254c261 < no_undefined_flag=" \${wl}-bernotok" --- > no_undefined_flag="" 316c323 < variables_saved_for_relink="PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" --- > variables_saved_for_relink="PATH LIBPATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" 322c329 < sys_lib_search_path_spec=" /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/ /usr/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/ /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/../../../../powerpc-ibm-aix5.3.0.0/lib/powerpc-ibm-aix5.3.0.0/4.2.0/ /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/../../../../powerpc-ibm-aix5.3.0.0/lib/ /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/../../../powerpc-ibm-aix5.3.0.0/4.2.0/ /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0/../../../ /lib/powerpc-ibm-aix5.3.0.0/4.2.0/ /lib/ /usr/lib/powerpc-ibm-aix5.3.0.0/4.2.0/ /usr/lib/" --- > sys_lib_search_path_spec="/opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.2.0 /opt/freeware/lib /lib /usr/lib" 340c347 < exclude_expsyms="_GLOBAL_OFFSET_TABLE_" --- > exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*" 350,351c357,358 < # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 < # Free Software Foundation, Inc. --- > # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, > # 2007, 2008 Free Software Foundation, Inc. 392,393c399,400 < VERSION=1.5.20 < TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" --- > VERSION=1.5.26 > TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)" 395,397c402,408 < # See if we are running on zsh, and set the options which allow our < # commands through without removal of \ escapes. < if test -n "${ZSH_VERSION+set}" ; then --- > # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). > if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: > # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which > # is contrary to our usage. Disable this feature. > alias -g '${1+"$@"}'='"$@"' 398a410,411 > else > case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac 399a413,414 > BIN_SH=xpg4; export BIN_SH # for Tru64 > DUALCASE=1; export DUALCASE # for MKS sh 454,455c469,481 < if test "${LC_ALL+set}" = set; then < save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL --- > lt_env= > for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES > do > eval "if test \"\${$lt_var+set}\" = set; then > save_$lt_var=\$$lt_var > lt_env=\"$lt_var=\$$lt_var \$lt_env\" > $lt_var=C > export $lt_var > fi" > done > > if test -n "$lt_env"; then > lt_env="env $lt_env" 457,459d482 < if test "${LANG+set}" = set; then < save_LANG="$LANG"; LANG=C; export LANG < fi 480a504,505 > duplicate_deps=no > preserve_args= 482a508,509 > extracted_archives= > extracted_serial=0 487a515,551 > # func_mktempdir [string] > # Make a temporary directory that won't clash with other running > # libtool processes, and avoids race conditions if possible. If > # given, STRING is the basename for that directory. > func_mktempdir () > { > my_template="${TMPDIR-/tmp}/${1-$progname}" > > if test "$run" = ":"; then > # Return a directory name, but don't create it in dry-run mode > my_tmpdir="${my_template}-$$" > else > > # If mktemp works, use that first and foremost > my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` > > if test ! -d "$my_tmpdir"; then > # Failing that, at least try and use $RANDOM to avoid a race > my_tmpdir="${my_template}-${RANDOM-0}$$" > > save_mktempdir_umask=`umask` > umask 0077 > $mkdir "$my_tmpdir" > umask $save_mktempdir_umask > fi > > # If we're not in dry-run mode, bomb out on failure > test -d "$my_tmpdir" || { > $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2 > exit $EXIT_FAILURE > } > fi > > $echo "X$my_tmpdir" | $Xsed > } > > 506,510c570,580 < sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` < if test "X$win32_nmres" = "Ximport" ; then < win32_libid_type="x86 archive import" < else < win32_libid_type="x86 archive static" --- > $SED -n -e '1,100{ > / I /{ > s,.*,import, > p > q > } > }'` > case $win32_nmres in > import*) win32_libid_type="x86 archive import";; > *) win32_libid_type="x86 archive static";; > esac 512d581 < fi 638c707,717 < my_xdir="$my_gentop/$my_xlib" --- > my_xlib_u=$my_xlib > while :; do > case " $extracted_archives " in > *" $my_xlib_u "*) > extracted_serial=`expr $extracted_serial + 1` > my_xlib_u=lt$extracted_serial-$my_xlib ;; > *) break ;; > esac > done > extracted_archives="$extracted_archives $my_xlib_u" > my_xdir="$my_gentop/$my_xlib_u" 644,646c723,725 < status=$? < if test "$status" -ne 0 && test ! -d "$my_xdir"; then < exit $status --- > exit_status=$? > if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then > exit $exit_status 700a780,781 > disable_libs=no > 763,767c844,849 < $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" < $echo < $echo "Copyright (C) 2005 Free Software Foundation, Inc." < $echo "This is free software; see the source for copying conditions. There is NO" < $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." --- > echo "\ > $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP > > Copyright (C) 2008 Free Software Foundation, Inc. > This is free software; see the source for copying conditions. There is NO > warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 817c899,903 < --tag) prevopt="--tag" prev=tag ;; --- > --tag) > prevopt="--tag" > prev=tag > preserve_args="$preserve_args --tag" > ;; 848a935,946 > case $disable_libs in > no) > ;; > shared) > build_libtool_libs=no > build_old_libs=yes > ;; > static) > build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` > ;; > esac > 1048c1146 < *.f90) xform=f90 ;; --- > *.[fF][09]?) xform=[fF][09]. ;; 1050a1149,1150 > *.obj) xform=obj ;; > *.sx) xform=sx ;; 1205,1207c1305,1307 < status=$? < if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then < exit $status --- > exit_status=$? > if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then > exit $exit_status 1219c1319 < if $run eval "$command"; then : --- > if $run eval $lt_env "$command"; then : 1291c1391 < if $run eval "$command"; then : --- > if $run eval $lt_env "$command"; then : 1409a1510 > notinst_path= # paths that contain not-installed libtool libraries 1422a1524 > single_module="${wl}-single_module" 1430,1431c1532,1534 < -all-static | -static) < if test "X$arg" = "X-all-static"; then --- > -all-static | -static | -static-libtool-libs) > case $arg in > -all-static) 1438c1541,1543 < else --- > prefer_static_libs=yes > ;; > -static) 1441a1547,1551 > prefer_static_libs=built > ;; > -static-libtool-libs) > if test -z "$pic_flag" && test -n "$link_static_flag"; then > dlopen_self=$dlopen_self_static 1442a1553,1555 > prefer_static_libs=yes > ;; > esac 1445d1557 < prefer_static_libs=yes 1619a1732,1736 > else > # If the PIC object exists, use it instead. > # $xdir was prepended to $pic_object above. > non_pic_object="$pic_object" > non_pic_objects="$non_pic_objects $non_pic_object" 1703,1704c1820,1821 < darwin_framework) < compiler_flags="$compiler_flags $arg" --- > darwin_framework|darwin_framework_skip) > test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" 1768,1770c1885,1891 < -framework|-arch) < prev=darwin_framework < compiler_flags="$compiler_flags $arg" --- > -framework|-arch|-isysroot) > case " $CC " in > *" ${arg} ${1} "* | *" ${arg} ${1} "*) > prev=darwin_framework_skip ;; > *) compiler_flags="$compiler_flags $arg" > prev=darwin_framework ;; > esac 1802c1923,1924 < exit $EXIT_FAILURE --- > absdir="$dir" > notinst_path="$notinst_path $dir" 1815a1938 > testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'` 1819a1943,1946 > case :$dllsearchpath: in > *":$testbindir:"*) ;; > *) dllsearchpath="$dllsearchpath:$testbindir";; > esac 1828c1955 < *-*-cygwin* | *-*-pw32* | *-*-beos*) --- > *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*) 1832c1959 < *-*-mingw* | *-*-os2*) --- > *-*-os2*) 1843a1971,1979 > ;; > *-*-sco3.2v5* | *-*-sco5v6*) > # Causes problems with __ctype > test "X$arg" = "X-lc" && continue > ;; > *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) > # Compiler inserts libc in the correct place for threads to work > test "X$arg" = "X-lc" && continue > ;; 1867c2003 < -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) --- > -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) 1873a2010,2014 > -multi_module) > single_module="${wl}-multi_module" > continue > ;; > 1885c2026,2032 < -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) --- > # -m*, -t[45]*, -txscale* pass through architecture-specific > # compiler args for GCC > # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC > # -F/path gives path to uninstalled frameworks, gcc on darwin > # @file GCC response files > -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ > -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) 1897d2043 < if test "$with_gcc" = "yes" ; then 1899d2044 < fi 1915c2060 < *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) --- > *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) 1917c2062 < # in order for the loader to find any dlls it needs. --- > # and Darwin in order for the loader to find any dlls it needs. 1976c2121 < -static) --- > -static | -static-libtool-libs) 2136a2282,2286 > else > # If the PIC object exists, use it instead. > # $xdir was prepended to $pic_object above. > non_pic_object="$pic_object" > non_pic_objects="$non_pic_objects $non_pic_object" 2242,2244c2392,2394 < status=$? < if test "$status" -ne 0 && test ! -d "$output_objdir"; then < exit $status --- > exit_status=$? > if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then > exit $exit_status 2307d2456 < notinst_path= # paths that contain not-installed libtool libraries 2354c2503 < -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) --- > -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) 2369c2518,2523 < for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do --- > if test "$linkmode" = lib; then > searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" > else > searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" > fi > for searchdir in $searchdirs; do 2543c2697 < $echo "$modename: cannot find the library \`$lib'" 1>&2 --- > $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2 2750c2904,2906 < { test "$prefer_static_libs" = no || test -z "$old_library"; }; then --- > { { test "$prefer_static_libs" = no || > test "$prefer_static_libs,$installed" = "built,yes"; } || > test -z "$old_library"; }; then 2793a2950,2953 > use_static_libs=$prefer_static_libs > if test "$use_static_libs" = built && test "$installed" = yes ; then > use_static_libs=no > fi 2795c2955 < { test "$prefer_static_libs" = no || test -z "$old_library"; }; then --- > { test "$use_static_libs" = no || test -z "$old_library"; }; then 2908c3068,3071 < *-*-sco3.2v5* ) add_dir="-L$dir" ;; --- > *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; > *-*-sysv4*uw2*) add_dir="-L$dir" ;; > *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ > *-*-unixware7*) add_dir="-L$dir" ;; 2912c3075,3076 < if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then --- > if /usr/bin/file -L $add 2> /dev/null | > $EGREP ": [^:]* bundle" >/dev/null ; then 3154a3319 > eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` 3159c3324,3326 < if test -f "$path/$depdepl" ; then --- > if test -f "$deplibdir/$depdepl" ; then > depdepl="$deplibdir/$depdepl" > elif test -f "$path/$depdepl" ; then 3160a3328,3330 > else > # Can't find it, oh well... > depdepl= 3308,3310c3478,3481 < if test -n "$deplibs"; then < $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 < fi --- > case " $deplibs" in > *\ -l* | *\ -L*) > $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;; > esac 3438c3609 < darwin|linux|osf|windows) --- > darwin|linux|osf|windows|none) 3449c3620 < current=`expr $number_major + $number_minor - 1` --- > current=`expr $number_major + $number_minor` 3451a3623 > lt_irix_increment=no 3510c3682,3683 < verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" --- > xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" > verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" 3523a3697,3699 > if test "X$lt_irix_increment" = "Xno"; then > major=`expr $current - $age` > else 3525c3701 < --- > fi 3662,3666c3838,3842 < for path in $notinst_path; do < lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'` < deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'` < dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'` < done --- > #for path in $notinst_path; do > # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` > # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` > # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` > #done 3718d3893 < test "X$arg" = "X-lc" && continue 3719a3895,3900 > *-*-sco3.2v5* | *-*-sco5v6*) > # Causes problems with __ctype > ;; > *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) > # Compiler inserts libc in the correct place for threads to work > ;; 3762,3763c3943 < $LTCC -o conftest conftest.c $deplibs < if test "$?" -eq 0 ; then --- > if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then 3768c3948 < if test "$name" != "" && test "$name" -ne "0"; then --- > if test "$name" != "" && test "$name" != "0"; then 3807,3809c3987 < $LTCC -o conftest conftest.c $i < # Did it work? < if test "$?" -eq 0 ; then --- > if $LTCC $LTCFLAGS -o conftest conftest.c $i; then 4053a4232,4260 > > # move library search paths that coincide with paths to not yet > # installed libraries to the beginning of the library search list > new_libs= > for path in $notinst_path; do > case " $new_libs " in > *" -L$path/$objdir "*) ;; > *) > case " $deplibs " in > *" -L$path/$objdir "*) > new_libs="$new_libs -L$path/$objdir" ;; > esac > ;; > esac > done > for deplib in $deplibs; do > case $deplib in > -L*) > case " $new_libs " in > *" $deplib "*) ;; > *) new_libs="$new_libs $deplib" ;; > esac > ;; > *) new_libs="$new_libs $deplib" ;; > esac > done > deplibs="$new_libs" > > 4098c4305,4308 < eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" --- > case $archive_cmds in > *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; > *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; > esac 4136a4347 > linknames= 4407,4409c4618,4621 < if test -n "$deplibs"; then < $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 < fi --- > case " $deplibs" in > *\ -l* | *\ -L*) > $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;; > esac 4456c4668,4669 < # -Wl from whole_archive_flag_spec --- > # -Wl from whole_archive_flag_spec and hope we can get by with > # turning comma into space.. 4461c4674,4675 < eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" --- > eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" > reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` 4567a4782,4810 > > # move library search paths that coincide with paths to not yet > # installed libraries to the beginning of the library search list > new_libs= > for path in $notinst_path; do > case " $new_libs " in > *" -L$path/$objdir "*) ;; > *) > case " $compile_deplibs " in > *" -L$path/$objdir "*) > new_libs="$new_libs -L$path/$objdir" ;; > esac > ;; > esac > done > for deplib in $compile_deplibs; do > case $deplib in > -L*) > case " $new_libs " in > *" $deplib "*) ;; > *) new_libs="$new_libs $deplib" ;; > esac > ;; > *) new_libs="$new_libs $deplib" ;; > esac > done > compile_deplibs="$new_libs" > > 4611a4855 > testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'` 4615a4860,4863 > case :$dllsearchpath: in > *":$testbindir:"*) ;; > *) dllsearchpath="$dllsearchpath:$testbindir";; > esac 4731a4980,4985 > case $host in > *cygwin* | *mingw* ) > $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' > $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' > ;; > esac 4733c4987 < $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' --- > $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' 4735a4990,4995 > case $host in > *cygwin* | *mingw* ) > $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' > $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' > ;; > esac 4852,4853c5112,5113 < $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" < $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? --- > $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" > $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? 4860,4861c5120,5128 < compile_command=`$echo "X$compile_command" | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%"` < finalize_command=`$echo "X$finalize_command" | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%"` --- > case $host in > *cygwin* | *mingw* ) > if test -f "$output_objdir/${outputname}.def" ; then > compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` > finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` > else > compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` > finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` > fi 4863a5131,5136 > compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` > finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s...@symfile@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` > ;; > esac > ;; > *) 4874,4875c5147,5148 < compile_command=`$echo "X$compile_command" | $Xsed -e "s% @symf...@%%"` < finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @symf...@%%"` --- > compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @symf...@%%" | $NL2SP` > finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @symf...@%%" | $NL2SP` 4880c5153 < compile_command=`$echo "X$compile_command" | $Xsed -e 's...@output@%'"$output"'%g'` --- > compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's...@output@%'"$output"'%g' | $NL2SP` 4886c5159 < status=$? --- > exit_status=$? 4894c5167 < exit $status --- > exit $exit_status 4967c5240 < relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's...@output@%\$progdir/\$file%g'` --- > relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's...@output@%\$progdir/\$file%g' | $NL2SP` 5004c5277 < relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` --- > relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` 5034,5035c5307,5310 < cwrappersource=`$echo ${objdir}/lt-${outputname}.c` < cwrapper=`$echo ${output}.exe` --- > output_name=`basename $output` > output_path=`dirname $output` > cwrappersource="$output_path/$objdir/lt-$output_name.c" > cwrapper="$output_path/$output_name.exe" 5061a5337,5339 > #include <string.h> > #include <ctype.h> > #include <sys/stat.h> 5072a5351 > # define PATH_SEPARATOR ':' 5080a5360,5361 > # ifndef PATH_SEPARATOR_2 > # define PATH_SEPARATOR_2 ';' 5081a5363 > #endif 5089a5372,5377 > #ifndef PATH_SEPARATOR_2 > # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) > #else /* PATH_SEPARATOR_2 */ > # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) > #endif /* PATH_SEPARATOR_2 */ > 5094a5383,5390 > /* -DDEBUG is fairly common in CFLAGS. */ > #undef DEBUG > #if defined DEBUGWRAPPER > # define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__) > #else > # define DEBUG(format, ...) > #endif > 5099,5100c5395,5397 < char * basename (const char *name); < char * fnqualify(const char *path); --- > const char * base_name (const char *name); > char * find_executable(const char *wrapper); > int check_executable(const char *path); 5110c5407,5409 < program_name = (char *) xstrdup ((char *) basename (argv[0])); --- > program_name = (char *) xstrdup (base_name (argv[0])); > DEBUG("(main) argv[0] : %s\n",argv[0]); > DEBUG("(main) program_name : %s\n",program_name); 5115c5414 < newargz[0] = "$SHELL"; --- > newargz[0] = (char *) xstrdup("$SHELL"); 5119c5418,5421 < newargz[1] = fnqualify(argv[0]); --- > newargz[1] = find_executable(argv[0]); > if (newargz[1] == NULL) > lt_fatal("Couldn't find %s", argv[0]); > DEBUG("(main) found exe at : %s\n",newargz[1]); 5125a5428,5434 > > for (i=0; i<argc+1; i++) > { > DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]); > ; > } > 5127a5437,5438 > case $host_os in > mingw*) 5128a5440,5444 > execv("$SHELL",(char const **)newargz); > EOF > ;; > *) > cat >> $cwrappersource <<EOF 5130a5447,5448 > ;; > esac 5153,5154c5471,5472 < char * < basename (const char *name) --- > const char * > base_name (const char *name) 5160c5478 < if (isalpha (name[0]) && name[1] == ':') --- > if (isalpha ((unsigned char)name[0]) && name[1] == ':') 5167c5485 < return (char *) base; --- > return base; 5169a5488,5514 > int > check_executable(const char * path) > { > struct stat st; > > DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); > if ((!path) || (!*path)) > return 0; > > if ((stat (path, &st) >= 0) && > ( > /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */ > #if defined (S_IXOTH) > ((st.st_mode & S_IXOTH) == S_IXOTH) || > #endif > #if defined (S_IXGRP) > ((st.st_mode & S_IXGRP) == S_IXGRP) || > #endif > ((st.st_mode & S_IXUSR) == S_IXUSR)) > ) > return 1; > else > return 0; > } > > /* Searches for the full path of the wrapper. Returns > newly allocated full path name if found, NULL otherwise */ 5171c5516 < fnqualify(const char *path) --- > find_executable (const char* wrapper) 5173,5174c5518,5521 < size_t size; < char *p; --- > int has_slash = 0; > const char* p; > const char* p_next; > /* static buffer for getcwd */ 5175a5523,5524 > int tmp_len; > char* concat_name; 5177c5526 < assert(path != NULL); --- > DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"); 5179c5528,5531 < /* Is it qualified already? */ --- > if ((wrapper == NULL) || (*wrapper == '\0')) > return NULL; > > /* Absolute path? */ 5181,5182c5533,5541 < if (isalpha (path[0]) && path[1] == ':') < return xstrdup (path); --- > if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') > { > concat_name = xstrdup (wrapper); > if (check_executable(concat_name)) > return concat_name; > XFREE(concat_name); > } > else > { 5184,5185c5543,5552 < if (IS_DIR_SEPARATOR (path[0])) < return xstrdup (path); --- > if (IS_DIR_SEPARATOR (wrapper[0])) > { > concat_name = xstrdup (wrapper); > if (check_executable(concat_name)) > return concat_name; > XFREE(concat_name); > } > #if defined (HAVE_DOS_BASED_FILE_SYSTEM) > } > #endif 5187,5188c5554,5577 < /* prepend the current directory */ < /* doesn't handle '~' */ --- > for (p = wrapper; *p; p++) > if (*p == '/') > { > has_slash = 1; > break; > } > if (!has_slash) > { > /* no slashes; search PATH */ > const char* path = getenv ("PATH"); > if (path != NULL) > { > for (p = path; *p; p = p_next) > { > const char* q; > size_t p_len; > for (q = p; *q; q++) > if (IS_PATH_SEPARATOR(*q)) > break; > p_len = q - p; > p_next = (*q == '\0' ? q : q + 1); > if (p_len == 0) > { > /* empty path: current directory */ 5191,5194c5580,5584 < size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */ < p = XMALLOC(char, size); < sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path); < return p; --- > tmp_len = strlen(tmp); > concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); > memcpy (concat_name, tmp, tmp_len); > concat_name[tmp_len] = '/'; > strcpy (concat_name + tmp_len + 1, wrapper); 5195a5586,5607 > else > { > concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1); > memcpy (concat_name, p, p_len); > concat_name[p_len] = '/'; > strcpy (concat_name + p_len + 1, wrapper); > } > if (check_executable(concat_name)) > return concat_name; > XFREE(concat_name); > } > } > /* not found in PATH; assume curdir */ > } > /* Relative path | not found in path: prepend cwd */ > if (getcwd (tmp, LT_PATHMAX) == NULL) > lt_fatal ("getcwd failed"); > tmp_len = strlen(tmp); > concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1); > memcpy (concat_name, tmp, tmp_len); > concat_name[tmp_len] = '/'; > strcpy (concat_name + tmp_len + 1, wrapper); 5196a5609,5614 > if (check_executable(concat_name)) > return concat_name; > XFREE(concat_name); > return NULL; > } > 5243c5661 < $run $LTCC -s -o $cwrapper $cwrappersource --- > $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource 5265a5684,5697 > # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). > if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then > emulate sh > NULLCMD=: > # Zsh 3.x and 4.x performs word splitting on \${1+\"\...@\"}, which > # is contrary to our usage. Disable this feature. > alias -g '\${1+\"\...@\"}'='\"\...@\"' > setopt NO_GLOB_SUBST > else > case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac > fi > BIN_SH=xpg4; export BIN_SH # for Tru64 > DUALCASE=1; export DUALCASE # for MKS sh > 5408c5840 < \$echo \"\$0: cannot exec \$program \${1+\"\...@\"}\" --- > \$echo \"\$0: cannot exec \$program \$*\" 5477,5479c5909,5911 < status=$? < if test "$status" -ne 0 && test ! -d "$gentop"; then < exit $status --- > exit_status=$? > if test "$exit_status" -ne 0 && test ! -d "$gentop"; then > exit $exit_status 5594c6026 < relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` --- > relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` 5939c6371 < relink_command=`$echo "$relink_command" | $SED "s...@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` --- > relink_command=`$echo "$relink_command" | $SP2NL | $SED "s...@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` 5941c6373 < relink_command=`$echo "$relink_command" | $SED "s...@inst_prefix_dir@%%"` --- > relink_command=`$echo "$relink_command" | $SP2NL | $SED "s...@inst_prefix_dir@%%" | $NL2SP` 6146,6157c6578 < tmpdir="/tmp" < test -n "$TMPDIR" && tmpdir="$TMPDIR" < tmpdir="$tmpdir/libtool-$$" < save_umask=`umask` < umask 0077 < if $mkdir "$tmpdir"; then < umask $save_umask < else < umask $save_umask < $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 < continue < fi --- > tmpdir=`func_mktempdir` 6161c6582 < relink_command=`$echo "X$relink_command" | $Xsed -e 's...@output@%'"$outputname"'%g'` --- > relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's...@output@%'"$outputname"'%g' | $NL2SP` 6281c6702 < $echo "----------------------------------------------------------------------" --- > $echo "X----------------------------------------------------------------------" | $Xsed 6314c6735 < $echo "----------------------------------------------------------------------" --- > $echo "X----------------------------------------------------------------------" | $Xsed 6371a6793 > if test ! -f "$dir/$dlname"; then 6374a6797 > fi 6437,6442c6860,6865 < if test "${save_LC_ALL+set}" = set; then < LC_ALL="$save_LC_ALL"; export LC_ALL < fi < if test "${save_LANG+set}" = set; then < LANG="$save_LANG"; export LANG < fi --- > for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES > do > eval "if test \"\${save_$lt_var+set}\" = set; then > $lt_var=\$save_$lt_var; export $lt_var > fi" > done 6531d6953 < test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" 6533c6955,6964 < if test "$mode" = uninstall; then --- > case "$mode" in > clean) > case " $library_names " in > # " " in the beginning catches empty $dlname > *" $dlname "*) ;; > *) rmfiles="$rmfiles $objdir/$dlname" ;; > esac > test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" > ;; > uninstall) 6565a6997,6998 > ;; > esac 6567d6999 < fi 6806c7238,7240 < -static do not do any dynamic linking of libtool libraries --- > -static do not do any dynamic linking of uninstalled libtool libraries > -static-libtool-libs > do not do any dynamic linking of libtool libraries 6865,6866c7299 < build_libtool_libs=no < build_old_libs=yes --- > disable_libs=shared 6870c7303 < build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac` --- > disable_libs=static ------------------------------------------------------------------------ The remainder of the comments for this report are too long. To view the rest of the comments, please view the bug report online at http://bugs.php.net/50190 -- Edit this bug report at http://bugs.php.net/?id=50190&edit=1
