b747c29c4e
When APR_INCLUDEDIR and APU_INCLUDEDIR point to the same directory, Apache builds properly. However, with per-package directory support, they point to different directories, and APU_INCLUDEDIR contains both the APR headers and the APU headers. Due to this, the Apache Makefile logic to generate its exports.c file leads to duplicate definitions, because the APR headers are considered twice: once from APR_INCLUDEDIR, once from APU_INCLUDEDIR. We fix this by introducing a patch to the Apache build system. In addition, apr provides a special libtool script that gets used by apr-util and apache. apr-util already had a fixup for this, but apache did not, which was causing the gcc from apr-util per-package directories be used during the apache build, causing build failures. To fix this, we adjust this libtool script to point to the correct tools in apache's per-package directories. There are no autobuilder failures for this, because Apache needs apr-util, and apr-util currently fails to build when BR2_PER_PACKAGE_DIRECTORIES=y. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 00281390e82db18fe0de4033be4045f9391a8ee5 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Date: Thu, 15 Nov 2018 14:04:29 +0100
|
|
Subject: [PATCH] server/Makefile.in: handle separate
|
|
APR_INCLUDE_DIR/APU_INCLUDE_DIR
|
|
|
|
If APR_INCLUDEDIR and APU_INCLUDEDIR point to different directories,
|
|
but for example APU_INCLUDEDIR contains both the apr headers and apu
|
|
headers, the "export_files" file will contain duplicate header files,
|
|
causing the exports.c file to contain duplicate definitions, making
|
|
the build fail.
|
|
|
|
This commit fixes that by making sure we only use the apr headers from
|
|
APR_INCLUDEDIR and the apu headers from the APU_INCLUDEDIR.
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Upstream: https://bz.apache.org/bugzilla/show_bug.cgi?id=62930
|
|
---
|
|
server/Makefile.in | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/server/Makefile.in b/server/Makefile.in
|
|
index 1fa334467d..2258f0bdf2 100644
|
|
--- a/server/Makefile.in
|
|
+++ b/server/Makefile.in
|
|
@@ -34,7 +34,6 @@ test_char.h: gen_test_char
|
|
util.lo: test_char.h
|
|
|
|
EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR)
|
|
-EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR)
|
|
|
|
# If export_files is a dependency here, but we remove it during this stage,
|
|
# when exports.c is generated, make will not detect that export_files is no
|
|
@@ -60,9 +59,8 @@ export_files:
|
|
ls $$dir/*.h ; \
|
|
done; \
|
|
echo "$(top_srcdir)/server/mpm_fdqueue.h"; \
|
|
- for dir in $(EXPORT_DIRS_APR); do \
|
|
- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \
|
|
- done; \
|
|
+ ls $(APR_INCLUDE_DIR)/{apr.h,apr_*.h} 2>/dev/null; \
|
|
+ ls $(APU_INCLUDE_DIR)/{apu.h,apu_*.h} 2>/dev/null; \
|
|
) | sed -e s,//,/,g | sort -u > $@
|
|
|
|
exports.c: export_files
|
|
--
|
|
2.19.1
|
|
|