From 49dd0b1ae91bd869c55ec3bd22bda1bdd4815088 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 4 May 2015 07:26:51 -0700 Subject: [PATCH] apr: 1.5.1 -> 1.5.2 Updated upgrade-and-fix-1.5.1.patch. Signed-off-by: Robert Yang --- .../apr/apr/upgrade-and-fix-1.5.1.patch | 11 ++++------- .../apr/{apr_1.5.1.bb => apr_1.5.2.bb} | 4 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) rename meta/recipes-support/apr/{apr_1.5.1.bb => apr_1.5.2.bb} (95%) 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 index 4bca38494b..9569645b8f 100644 --- 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 @@ -16,7 +16,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 6f99733..5fe028f 100644 +index a2a5194..5fe028f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ @@ -31,11 +31,11 @@ index 6f99733..5fe028f 100644 etags: etags `find . -name '*.[ch]'` --make_tools_dir: +-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) +-tools/gen_test_char.lo: tools/gen_test_char.c - $(APR_MKDIR) tools +- $(LT_COMPILE) - --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 @@ -43,6 +43,3 @@ index 6f99733..5fe028f 100644 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.5.1.bb b/meta/recipes-support/apr/apr_1.5.2.bb similarity index 95% rename from meta/recipes-support/apr/apr_1.5.1.bb rename to meta/recipes-support/apr/apr_1.5.2.bb index 985ef67530..aac6276b14 100644 --- a/meta/recipes-support/apr/apr_1.5.1.bb +++ b/meta/recipes-support/apr/apr_1.5.2.bb @@ -17,8 +17,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://upgrade-and-fix-1.5.1.patch \ " -SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" -SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac" +SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa" +SRC_URI[sha256sum] = "7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a" inherit autotools-brokensep lib_package binconfig multilib_header ptest -- 2.40.1