0003-server-Makefile.in-handle-separate-APR_INCLUDE_DIR-A.patch 1.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 00281390e82db18fe0de4033be4045f9391a8ee5 Mon Sep 17 00:00:00 2001
  2. From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  3. Date: Thu, 15 Nov 2018 14:04:29 +0100
  4. Subject: [PATCH] server/Makefile.in: handle separate
  5. APR_INCLUDE_DIR/APU_INCLUDE_DIR
  6. If APR_INCLUDEDIR and APU_INCLUDEDIR point to different directories,
  7. but for example APU_INCLUDEDIR contains both the apr headers and apu
  8. headers, the "export_files" file will contain duplicate header files,
  9. causing the exports.c file to contain duplicate definitions, making
  10. the build fail.
  11. This commit fixes that by making sure we only use the apr headers from
  12. APR_INCLUDEDIR and the apu headers from the APU_INCLUDEDIR.
  13. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  14. Upstream: https://bz.apache.org/bugzilla/show_bug.cgi?id=62930
  15. ---
  16. server/Makefile.in | 6 ++----
  17. 1 file changed, 2 insertions(+), 4 deletions(-)
  18. diff --git a/server/Makefile.in b/server/Makefile.in
  19. index 1fa334467d..2258f0bdf2 100644
  20. --- a/server/Makefile.in
  21. +++ b/server/Makefile.in
  22. @@ -34,7 +34,6 @@ test_char.h: gen_test_char
  23. util.lo: test_char.h
  24. EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
  25. -EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
  26. # If export_files is a dependency here, but we remove it during this stage,
  27. # when exports.c is generated, make will not detect that export_files is no
  28. @@ -60,9 +59,8 @@ export_files:
  29. ls $$dir/*.h ; \
  30. done; \
  31. echo "$(top_srcdir)/server/mpm_fdqueue.h"; \
  32. - for dir in $(EXPORT_DIRS_APR); do \
  33. - ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
  34. - done; \
  35. + ls $(APR_INCLUDE_DIR)/{apr.h,apr_*.h} 2>/dev/null; \
  36. + ls $(APU_INCLUDE_DIR)/{apu.h,apu_*.h} 2>/dev/null; \
  37. ) | sed -e s,//,/,g | sort -u > $@
  38. exports.c: export_files
  39. --
  40. 2.19.1