diff options
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.patch | 48 |
1 files changed, 48 insertions, 0 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 new file mode 100644 index 0000000000..4bca38494b --- /dev/null +++ b/meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch | |||
@@ -0,0 +1,48 @@ | |||
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 $BUILD_CC. | ||
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 | diff --git a/Makefile.in b/Makefile.in | ||
19 | index 6f99733..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 | -make_tools_dir: | ||
35 | - $(APR_MKDIR) tools | ||
36 | - | ||
37 | -OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) | ||
38 | -tools/gen_test_char.lo: make_tools_dir | ||
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 | ||
46 | -- | ||
47 | 1.8.1.2 | ||
48 | |||