[prev in list] [next in list] [prev in thread] [next in thread]
List: apr-cvs
Subject: svn commit: r1872037 - in /apr/apr/branches/1.7.x: ./ CHANGES Makefile.in build/ build/apr_rules.mk.
From: minfrin () apache ! org
Date: 2019-12-27 21:56:09
Message-ID: 20191227215609.5287D17A010 () svn01-us-east ! apache ! org
[Download RAW message or body]
Author: minfrin
Date: Fri Dec 27 21:56:08 2019
New Revision: 1872037
URL: http://svn.apache.org/viewvc?rev=1872037&view=rev
Log:
Backport r1871998
While cross-compiling, the tools/gen_test_char could not
be executed at build time, use AX_PROG_CC_FOR_BUILD to
build native tools/gen_test_char
Support explicit libtool by variable assigning before buildcheck.sh,
it is helpful for cross-compiling (such as libtool=aarch64-linux-libtool)
Added:
apr/apr/branches/1.7.x/build/ax_prog_cc_for_build.m4
- copied unchanged from r1871998, apr/apr/trunk/build/ax_prog_cc_for_build.m4
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/CHANGES
apr/apr/branches/1.7.x/Makefile.in
apr/apr/branches/1.7.x/build/ (props changed)
apr/apr/branches/1.7.x/build/apr_rules.mk.in
apr/apr/branches/1.7.x/build/buildcheck.sh
apr/apr/branches/1.7.x/configure.in
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1871998
Modified: apr/apr/branches/1.7.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/CHANGES?rev=1872037&r1=1872036&r2=1872037&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.7.x/CHANGES [utf-8] Fri Dec 27 21:56:08 2019
@@ -1,6 +1,14 @@
-*- coding: utf-8 -*-
Changes for APR 1.7.1
+ *) While cross-compiling, the tools/gen_test_char could not
+ be executed at build time, use AX_PROG_CC_FOR_BUILD to
+ build native tools/gen_test_char
+
+ Support explicit libtool by variable assigning before buildcheck.sh,
+ it is helpful for cross-compiling (such as libtool=aarch64-linux-libtool)
+ [Hongxu Jia <hongxu.jia windriver.com>]
+
*) Avoid an overflow on 32 bit platforms. [René Hjortskov Nielsen
<r... hjortskov.dk>]
Modified: apr/apr/branches/1.7.x/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/Makefile.in?rev=1872037&r1=1872036&r2=1872037&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/Makefile.in (original)
+++ apr/apr/branches/1.7.x/Makefile.in Fri Dec 27 21:56:08 2019
@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@
CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
build/apr_rules.out tools/gen_test_char@EXEEXT@ \
- tools/gen_test_char.o tools/gen_test_char.lo \
+ tools/gen_test_char.o \
include/private/apr_escape_test_char.h
DISTCLEAN_TARGETS = config.cache config.log config.status \
include/apr.h include/arch/unix/apr_private.h \
@@ -131,13 +131,9 @@ check: $(TARGET_LIB)
etags:
etags `find . -name '*.[ch]'`
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-tools/gen_test_char.lo: tools/gen_test_char.c
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
$(APR_MKDIR) tools
- $(LT_COMPILE)
-
-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
$(APR_MKDIR) include/private
Propchange: apr/apr/branches/1.7.x/build/
------------------------------------------------------------------------------
Merged /apr/apr/trunk/build:r1871998
Modified: apr/apr/branches/1.7.x/build/apr_rules.mk.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/build/apr_rules.mk.in?rev=1872037&r1=1872036&r2=1872037&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/build/apr_rules.mk.in (original)
+++ apr/apr/branches/1.7.x/build/apr_rules.mk.in Fri Dec 27 21:56:08 2019
@@ -33,6 +33,7 @@ APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
APR_DOTTED_VERSION=@APR_DOTTED_VERSION@
CC=@CC@
+CC_FOR_BUILD=@CC_FOR_BUILD@
RM=@RM@
AWK=@AWK@
SHELL=@SHELL@
Modified: apr/apr/branches/1.7.x/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/build/buildcheck.sh?rev=1872037&r1=1872036&r2=1872037&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/build/buildcheck.sh (original)
+++ apr/apr/branches/1.7.x/build/buildcheck.sh Fri Dec 27 21:56:08 2019
@@ -40,7 +40,9 @@ fi
# output is multiline from 1.5 onwards
# Require libtool 1.4 or newer
-libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+if test -z "$libtool"; then
+ libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+fi
lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- \
].*//g;q'` if test -z "$lt_pversion"; then
echo "buildconf: libtool not found."
Modified: apr/apr/branches/1.7.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/configure.in?rev=1872037&r1=1872036&r2=1872037&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/configure.in (original)
+++ apr/apr/branches/1.7.x/configure.in Fri Dec 27 21:56:08 2019
@@ -26,6 +26,8 @@ sinclude(build/ltoptions.m4)
sinclude(build/ltversion.m4)
sinclude(build/lt~obsolete.m4)
+sinclude(build/ax_prog_cc_for_build.m4)
+
dnl Hard-coded top of apr_private.h:
AH_TOP([
#ifndef APR_PRIVATE_H
@@ -183,6 +185,9 @@ dnl can only be used once within a confi
dnl preload section from invoking the macro to get compiler info.
AC_PROG_CC
+dnl Check build CC for gen_test_char compiling which is executed at build time.
+AX_PROG_CC_FOR_BUILD
+
dnl AC_PROG_SED is only avaliable in recent autoconf versions.
dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
ifdef([AC_PROG_SED],
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic