201-upgrade-and-fix-1.5.1.patch (1796B)
1 Makefile.in: fix cross compiling failed 2 3 The tools/gen_test_char was invoked at build time, 4 and it didn't work for the cross compiling, so we 5 compile it with $BUILDCC. 6 7 Remove the 'tools' dir creation, it always existed. 8 And it caused gen_test_char unexpected rebuilt at 9 do_install time. 10 11 Upstream-Status: inappropriate [oe specific] 12 13 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 14 --- 15 Makefile.in | 10 ++-------- 16 1 file changed, 2 insertions(+), 8 deletions(-) 17 18 Index: apr-1.5.2/Makefile.in 19 =================================================================== 20 --- apr-1.5.2.orig/Makefile.in 21 +++ apr-1.5.2/Makefile.in 22 @@ -20,7 +20,7 @@ INCDIR=./include 23 OSDIR=$(top_srcdir)/include/arch/@OSDIR@ 24 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@ 25 INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@ -I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private 26 - 27 +BUILDCC=gcc 28 # 29 # Macros for target determination 30 # 31 @@ -47,7 +47,6 @@ LT_VERSION = @LT_VERSION@ 32 33 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ 34 build/apr_rules.out tools/gen_test_char@EXEEXT@ \ 35 - tools/gen_test_char.o tools/gen_test_char.lo \ 36 include/private/apr_escape_test_char.h 37 DISTCLEAN_TARGETS = config.cache config.log config.status \ 38 include/apr.h include/arch/unix/apr_private.h \ 39 @@ -135,9 +134,9 @@ tools/gen_test_char.lo: tools/gen_test_c 40 $(APR_MKDIR) tools 41 $(LT_COMPILE) 42 43 -tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) 44 - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) 45 - 46 +tools/gen_test_char@EXEEXT@: tools/gen_test_char.c 47 + $(BUILDCC) $(CFLAGS_FOR_BUILD) $< -o $@ 48 + 49 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ 50 $(APR_MKDIR) include/private 51 tools/gen_test_char@EXEEXT@ > $@