summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-02-02 04:06:11 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commit561d0ce5031429e78220f1d4e206829ad3a6cd1b (patch)
tree6ec1ddfd739dce56f3cd275b4f285b78061c5e20 /meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
parent659d10a64cab58ffcf24522d17960adc66f7158d (diff)
downloadpoky-561d0ce5031429e78220f1d4e206829ad3a6cd1b.tar.gz
apr: 1.6.2 -> 1.6.3
1. Improve inappropriate patches: - Drop inappropriate configure_fixes.patch Use setting variable ac_cv_file__dev_zero and ac_cv_sizeof_struct_iovec to replace - Drop cleanup.patch Aassign variable libtool at ./buildconf executing and use 0001-build-buildcheck.sh-improve-libtool-detection.patch to replace. Submitted it to upstream. - Rename configfix.patch to 0002-apr-Remove-workdir-path-references-from-installed-ap.patch Add its original comments and author, explain why it is inappropriate - Drop upgrade-and-fix-1.5.1.patch Use 0003-Makefile.in-configure.in-support-cross-compiling.patch to replace. And submitted it to upstream. 2. Fix build path issue to improve reproducibility (From OE-Core rev: 29c4b19e640b544c9c351aec4292a3f65b619998) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch')
-rw-r--r--meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch b/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
deleted file mode 100644
index 16499f5ac9..0000000000
--- a/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Makefile.in: fix cross compiling failed
2
3The tools/gen_test_char was invoked at build time,
4and it didn't work for the cross compiling, so we
5compile it with $BUILD_CC.
6
7Remove the 'tools' dir creation, it always existed.
8And it caused gen_test_char unexpected rebuilt at
9do_install time.
10
11Upstream-Status: Inappropriate [oe specific]
12
13Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
14---
15 Makefile.in | 10 ++--------
16 1 file changed, 2 insertions(+), 8 deletions(-)
17
18diff --git a/Makefile.in b/Makefile.in
19index a2a5194..5fe028f 100644
20--- a/Makefile.in
21+++ b/Makefile.in
22@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
23
24 CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
25 build/apr_rules.out tools/gen_test_char@EXEEXT@ \
26- tools/gen_test_char.o tools/gen_test_char.lo \
27 include/private/apr_escape_test_char.h
28 DISTCLEAN_TARGETS = config.cache config.log config.status \
29 include/apr.h include/arch/unix/apr_private.h \
30@@ -129,13 +128,8 @@ check: $(TARGET_LIB)
31 etags:
32 etags `find . -name '*.[ch]'`
33
34-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
35-tools/gen_test_char.lo: tools/gen_test_char.c
36- $(APR_MKDIR) tools
37- $(LT_COMPILE)
38-
39-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
40- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
41+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
42+ $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@
43
44 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
45 $(APR_MKDIR) include/private