1*4882a593SmuzhiyunFix cross-compilation 2*4882a593Smuzhiyun 3*4882a593SmuzhiyunPatch was backported from Apache httpd: 4*4882a593Smuzhiyunhttp://svn.apache.org/viewvc?view=revision&revision=1327907 5*4882a593Smuzhiyunhttp://svn.apache.org/viewvc?view=revision&revision=1328390 6*4882a593Smuzhiyunhttp://svn.apache.org/viewvc?view=revision&revision=1328714 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunPatch submitted upstream: 9*4882a593Smuzhiyunhttps://issues.apache.org/bugzilla/show_bug.cgi?id=57058 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunSigned-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in 14*4882a593Smuzhiyun--- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 15*4882a593Smuzhiyun+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 16*4882a593Smuzhiyun@@ -118,6 +118,16 @@ 17*4882a593Smuzhiyun echo "Configuring APR library" 18*4882a593Smuzhiyun echo "Platform: $host" 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless 21*4882a593Smuzhiyun+dnl we got already CC_FOR_BUILD from environment. 22*4882a593Smuzhiyun+if test "x${build_alias}" != "x${host_alias}"; then 23*4882a593Smuzhiyun+ if test "x${CC_FOR_BUILD}" = "x"; then 24*4882a593Smuzhiyun+ CC_FOR_BUILD=cc 25*4882a593Smuzhiyun+ fi 26*4882a593Smuzhiyun+fi 27*4882a593Smuzhiyun+AC_SUBST(CC_FOR_BUILD) 28*4882a593Smuzhiyun+AC_SUBST(CFLAGS_FOR_BUILD) 29*4882a593Smuzhiyun+ 30*4882a593Smuzhiyun dnl Some initial steps for configuration. We setup the default directory 31*4882a593Smuzhiyun dnl and which files are to be configured. 32*4882a593Smuzhiyun 33*4882a593Smuzhiyundiff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in 34*4882a593Smuzhiyun--- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 35*4882a593Smuzhiyun+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 36*4882a593Smuzhiyun@@ -8,6 +8,8 @@ 37*4882a593Smuzhiyun # APR (Apache Portable Runtime) library Makefile. 38*4882a593Smuzhiyun # 39*4882a593Smuzhiyun CPP = @CPP@ 40*4882a593Smuzhiyun+CC_FOR_BUILD = @CC_FOR_BUILD@ 41*4882a593Smuzhiyun+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun # get substituted into some targets 44*4882a593Smuzhiyun APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ 45*4882a593Smuzhiyun@@ -134,8 +134,13 @@ 46*4882a593Smuzhiyun $(APR_MKDIR) tools 47*4882a593Smuzhiyun $(LT_COMPILE) 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun+ifdef CC_FOR_BUILD 50*4882a593Smuzhiyun+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) 51*4882a593Smuzhiyun+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< 52*4882a593Smuzhiyun+else 53*4882a593Smuzhiyun tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) 54*4882a593Smuzhiyun $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) 55*4882a593Smuzhiyun+endif 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ 58*4882a593Smuzhiyun $(APR_MKDIR) include/private 59