You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2021/05/24 21:36:10 UTC
svn commit: r1890174 - in /apr/apr/branches/1.6.x: ./ CHANGES Makefile.in
configure.in test/Makefile.in
Author: michaelo
Date: Mon May 24 21:36:10 2021
New Revision: 1890174
URL: http://svn.apache.org/viewvc?rev=1890174&view=rev
Log:
Backport r1865793 from 1.7.x:
Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
Modified:
apr/apr/branches/1.6.x/ (props changed)
apr/apr/branches/1.6.x/CHANGES
apr/apr/branches/1.6.x/Makefile.in
apr/apr/branches/1.6.x/configure.in
apr/apr/branches/1.6.x/test/Makefile.in
Propchange: apr/apr/branches/1.6.x/
------------------------------------------------------------------------------
Merged /apr/apr/branches/1.7.x:r1865793
Modified: apr/apr/branches/1.6.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/CHANGES?rev=1890174&r1=1890173&r2=1890174&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.6.x/CHANGES [utf-8] Mon May 24 21:36:10 2021
@@ -6,6 +6,8 @@ Changes for APR 1.6.6
events are emitted on pool clear/destroy for proper accounting.
[Brane Čibej]
+ *) Add --tag=CC to libtool invocations. PR 62640. [Michael Osipov]
+
Changes for APR 1.6.5
*) Fix Win32 build breakage in apr_os_exp_time_put() in 1.6.4. [Rainer Jung]
Modified: apr/apr/branches/1.6.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/Makefile.in?rev=1890174&r1=1890173&r2=1890174&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/Makefile.in (original)
+++ apr/apr/branches/1.6.x/Makefile.in Mon May 24 21:36:10 2021
@@ -144,7 +144,7 @@ include/private/apr_escape_test_char.h:
$(APR_MKDIR) include/private
tools/gen_test_char@EXEEXT@ > $@
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) $(LT_LDFLAGS) \
@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
# DO NOT REMOVE
Modified: apr/apr/branches/1.6.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/configure.in?rev=1890174&r1=1890173&r2=1890174&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/configure.in (original)
+++ apr/apr/branches/1.6.x/configure.in Mon May 24 21:36:10 2021
@@ -280,9 +280,9 @@ AC_ARG_WITH(libtool, [ --without-libtoo
[ use_libtool=$withval ], [ use_libtool="yes" ] )
if test "x$use_libtool" = "xyes"; then
- lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
+ lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@'
LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
- link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
+ link="\$(LIBTOOL) \$(LTFLAGS) --mode=link --tag=CC \$(COMPILE) \$(LT_LDFLAGS) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
so_ext='lo'
lib_target='-rpath $(libdir) $(OBJECTS)'
export_lib_target='-rpath \$(libdir) \$(OBJECTS)'
Modified: apr/apr/branches/1.6.x/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.6.x/test/Makefile.in?rev=1890174&r1=1890173&r2=1890174&view=diff
==============================================================================
--- apr/apr/branches/1.6.x/test/Makefile.in (original)
+++ apr/apr/branches/1.6.x/test/Makefile.in Mon May 24 21:36:10 2021
@@ -67,7 +67,7 @@ INCLUDES=-I$(INCDIR) -I$(srcdir)/../incl
# link programs using -no-install to get real executables not
# libtool wrapper scripts which link an executable when first run.
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LT_LDFLAGS) \
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) $(LT_LDFLAGS) \
@LT_NO_INSTALL@ $(ALL_LDFLAGS) -o $@
# STDTEST_PORTABLE;
@@ -115,18 +115,18 @@ globalmutexchild@EXEEXT@: $(OBJECTS_glob
# Note -prefer-pic is only supported with libtool-1.4+
mod_test.lo: $(srcdir)/mod_test.c
- $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -prefer-pic -o $@ \
+ $(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -prefer-pic -o $@ \
-c $(srcdir)/mod_test.c
OBJECTS_mod_test = mod_test.lo
mod_test.la: $(OBJECTS_mod_test) $(LOCAL_LIBS)
- $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` -module \
+ $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) -rpath `pwd` -module \
-avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \
$(OBJECTS_mod_test) $(LOCAL_LIBS)
OBJECTS_libmod_test = mod_test.lo $(LOCAL_LIBS)
libmod_test.la: $(OBJECTS_libmod_test)
- $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` \
+ $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(COMPILE) -rpath `pwd` \
-avoid-version $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ \
$(OBJECTS_libmod_test) $(ALL_LIBS)