201-upgrade-and-fix-1.5.1.patch 1.8 KB

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