2667N/APatch origin: in-house

2667N/APatch status: Solaris-specific; not suitable for upstream

2667N/A

2667N/AFixes problem where APR-util Parfait build wouldn't analyze mysql and

2667N/Asqlite3 modules as apr_dbd_sqlite3.o.bc and apr_dbd_mysql.o.bc were

2667N/Aremoved here.

2667N/A

3019N/AIt also creates bc equivalents for static library archives as used for

3019N/Alinking Apache httpd binary.

3019N/A

3019N/A--- build/ltmain.sh

3019N/A+++ build/ltmain.sh

2667N/A@@ -7548,7 +7548,7 @@

2667N/A tempremovelist=`$ECHO "$output_objdir/*"`

2667N/A for p in $tempremovelist; do

2667N/A case $p in

2667N/A- *.$objext | *.gcno)

2667N/A+ *.$objext | *.$objext.bc | *.gcno)

2667N/A ;;

2667N/A $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)

2667N/A if test "X$precious_files_regex" != "X"; then

3019N/A@@ -9123,6 +9123,14 @@

3019N/A func_append oldobjs " $func_extract_archives_result"

3019N/A fi

3019N/A

3019N/A+ # Create also list of Parfait objects.

3019N/A+ for obj in $oldobjs

3019N/A+ do

3019N/A+ if test -f $obj.bc; then

3019N/A+ oldobjs_bc+=" $obj.bc"

3019N/A+ fi

3019N/A+ done

3019N/A+

3019N/A # POSIX demands no paths to be encoded in archives. We have

3019N/A # to avoid creating archives with duplicate basenames if we

3019N/A # might have to extract them afterwards, e.g., when creating a

3019N/A@@ -9170,12 +9178,19 @@

3019N/A fi

3019N/A func_to_tool_file "$oldlib" func_convert_file_msys_to_w32

3019N/A tool_oldlib=$func_to_tool_file_result

3019N/A- eval cmds=\"$old_archive_cmds\"

3019N/A+ if test -z "$oldobjs_bc"; then

3019N/A+ eval cmds=\"$old_archive_cmds\"

3019N/A+ else

3019N/A+ eval cmds=\"$old_archive_cmds~$old_archive_bc_cmds\"

3019N/A+ fi

3019N/A

3019N/A func_len " $cmds"

3019N/A len=$func_len_result

3019N/A if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then

3019N/A cmds=$old_archive_cmds

3019N/A+ if test -n "$oldobjs_bc"; then

3019N/A+ cmds+="~$old_archive_bc_cmds"

3019N/A+ fi

3019N/A elif test -n "$archiver_list_spec"; then

3019N/A func_verbose "using command file archive linking..."

3019N/A for obj in $oldobjs

3019N/A--- build/libtool.m4

3019N/A+++ build/libtool.m4

3019N/A@@ -1465,6 +1465,7 @@

3019N/A

3019N/A # Determine commands to create old-style static archives.

3019N/A old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

3019N/A+old_archive_bc_cmds='$AR $AR_FLAGS $oldlib.bc$oldobjs_bc'

3019N/A old_postinstall_cmds='chmod 644 $oldlib'

3019N/A old_postuninstall_cmds=

3019N/A

3019N/A@@ -1478,6 +1479,7 @@

3019N/A ;;

3019N/A esac

3019N/A old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"

3019N/A+ old_archive_bc_cmds="$old_archive_bc_cmds~\$RANLIB \$tool_oldlib.bc"

3019N/A fi

3019N/A

3019N/A case $host_os in

3019N/A@@ -1490,6 +1492,8 @@

3019N/A _LT_DECL([], [old_postuninstall_cmds], [2])

3019N/A _LT_TAGDECL([], [old_archive_cmds], [2],

3019N/A [Commands used to build an old-style archive])

3019N/A+_LT_TAGDECL([], [old_archive_bc_cmds], [2],

3019N/A+ [Commands used to build an old-style archive from Parfait bc files])

3019N/A _LT_DECL([], [lock_old_archive_extraction], [0],

3019N/A [Whether to use a lock for old archive extraction])

3019N/A ])# _LT_CMD_OLD_ARCHIVE