summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-05-04 07:26:51 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:43:59 +0100
commit109d670e5d189d4ba7ae8b4dbd3d53a549a31875 (patch)
tree4a84bec54eb6bc40ca58a7446c7840b7ecf9010b
parent27387f58d4284091f5b485d2979f8560d720456e (diff)
downloadpoky-109d670e5d189d4ba7ae8b4dbd3d53a549a31875.tar.gz
apr: 1.5.1 -> 1.5.2
Updated upgrade-and-fix-1.5.1.patch. (From OE-Core rev: 49dd0b1ae91bd869c55ec3bd22bda1bdd4815088) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr/upgrade-and-fix-1.5.1.patch11
-rw-r--r--meta/recipes-support/apr/apr_1.5.2.bb (renamed from meta/recipes-support/apr/apr_1.5.1.bb)4
2 files changed, 6 insertions, 9 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
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 <hongxu.jia@windriver.com>
16 1 file changed, 2 insertions(+), 8 deletions(-) 16 1 file changed, 2 insertions(+), 8 deletions(-)
17 17
18diff --git a/Makefile.in b/Makefile.in 18diff --git a/Makefile.in b/Makefile.in
19index 6f99733..5fe028f 100644 19index a2a5194..5fe028f 100644
20--- a/Makefile.in 20--- a/Makefile.in
21+++ b/Makefile.in 21+++ b/Makefile.in
22@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@ 22@@ -46,7 +46,6 @@ LT_VERSION = @LT_VERSION@
@@ -31,11 +31,11 @@ index 6f99733..5fe028f 100644
31 etags: 31 etags:
32 etags `find . -name '*.[ch]'` 32 etags `find . -name '*.[ch]'`
33 33
34-make_tools_dir: 34-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
35-tools/gen_test_char.lo: tools/gen_test_char.c
35- $(APR_MKDIR) tools 36- $(APR_MKDIR) tools
37- $(LT_COMPILE)
36- 38-
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) 39-tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
40- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) 40- $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
41+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c 41+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
@@ -43,6 +43,3 @@ index 6f99733..5fe028f 100644
43 43
44 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ 44 include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
45 $(APR_MKDIR) include/private 45 $(APR_MKDIR) include/private
46--
471.8.1.2
48
diff --git a/meta/recipes-support/apr/apr_1.5.1.bb b/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 \
17 file://upgrade-and-fix-1.5.1.patch \ 17 file://upgrade-and-fix-1.5.1.patch \
18" 18"
19 19
20SRC_URI[md5sum] = "5486180ec5a23efb5cae6d4292b300ab" 20SRC_URI[md5sum] = "4e9769f3349fe11fc0a5e1b224c236aa"
21SRC_URI[sha256sum] = "e94abe431d4da48425fcccdb27b469bd0f8151488f82e5630a56f26590e198ac" 21SRC_URI[sha256sum] = "7d03ed29c22a7152be45b8e50431063736df9e1daa1ddf93f6a547ba7a28f67a"
22 22
23inherit autotools-brokensep lib_package binconfig multilib_header ptest 23inherit autotools-brokensep lib_package binconfig multilib_header ptest
24 24