diff options
Diffstat (limited to 'meta/recipes-support/apr')
| -rw-r--r-- | meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-support/apr/apr_1.5.1.bb (renamed from meta/recipes-support/apr/apr_1.4.8.bb) | 7 |
2 files changed, 52 insertions, 3 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 @@ +Makefile.in: fix cross compiling failed + +The tools/gen_test_char was invoked at build time, +and it didn't work for the cross compiling, so we +compile it with $BUILD_CC. + +Remove the 'tools' dir creation, it always existed. +And it caused gen_test_char unexpected rebuilt at +do_install time. + +Upstream-Status: inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.in | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6f99733..5fe028f 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ + + CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ + build/apr_rules.out tools/gen_test_char@EXEEXT@ \ +- tools/gen_test_char.o tools/gen_test_char.lo \ + include/private/apr_escape_test_char.h + DISTCLEAN_TARGETS = config.cache config.log config.status \ + include/apr.h include/arch/unix/apr_private.h \ +@@ -129,13 +128,8 @@ check: $(TARGET_LIB) + etags: + etags `find . -name '*.[ch]'` + +-make_tools_dir: +- $(APR_MKDIR) tools +- +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +-tools/gen_test_char.lo: make_tools_dir +-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) +- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) ++tools/gen_test_char@EXEEXT@: tools/gen_test_char.c ++ $(BUILD_CC) $(CFLAGS_FOR_BUILD) $< -o $@ + + include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ + $(APR_MKDIR) include/private +-- +1.8.1.2 + diff --git a/meta/recipes-support/apr/apr_1.4.8.bb b/meta/recipes-support/apr/apr_1.5.1.bb index 0a77ad786a..2720b523f3 100644 --- a/meta/recipes-support/apr/apr_1.4.8.bb +++ b/meta/recipes-support/apr/apr_1.5.1.bb @@ -4,7 +4,7 @@ SECTION = "libs" DEPENDS = "util-linux" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0c35ff3c4c83b89d2f076e315caac28b \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=4dfd4cd216828c8cae5de5a12f3844c8 \ file://include/apr_lib.h;endline=17;md5=ee42fa7575dc40580a9e01c1b75fae96" BBCLASSEXTEND = "native" @@ -14,10 +14,11 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://cleanup.patch \ file://configfix.patch \ file://run-ptest \ + file://upgrade-and-fix-1.5.1.patch \ " -SRC_URI[md5sum] = "ce2ab01a0c3cdb71cf0a6326b8654f41" -SRC_URI[sha256sum] = "61b8d2f8d321c6365ee3d71d0bb41f3a89c44da6124cc5b407a3b8319d660421" +SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" +SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac" inherit autotools-brokensep lib_package binconfig multilib_header ptest |