summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-12-30 10:55:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:38 +0000
commitcfa0eb3d0c4f6d62b976dd3a616915799f295c20 (patch)
tree40ca8128dd1d79681363dab0cb5e932f3f57e23e /meta
parente3928c590c1c870ef52672f56d5188a60747a8c2 (diff)
downloadpoky-cfa0eb3d0c4f6d62b976dd3a616915799f295c20.tar.gz
apr-util: Upgrade to 1.4.1
(From OE-Core rev: f9ff5ecf55859984d3dbe66378eb7ee54ad28546) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch10
-rw-r--r--meta/recipes-support/apr/apr-util_1.4.1.bb (renamed from meta/recipes-support/apr/apr-util_1.3.12.bb)6
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch
index 19252363ab..91e244ce2c 100644
--- a/meta/recipes-support/apr/apr-util/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Inappropriate [configuration] 1Upstream-Status: Inappropriate [configuration]
2 2
3Index: apr-util-1.3.4/configure.in 3Index: apr-util-1.4.1/configure.in
4=================================================================== 4===================================================================
5--- apr-util-1.3.4.orig/configure.in 5--- apr-util-1.4.1.orig/configure.in 2009-12-18 03:15:19.000000000 +0800
6+++ apr-util-1.3.4/configure.in 6+++ apr-util-1.4.1/configure.in 2011-12-30 13:32:07.000000000 +0800
7@@ -8,14 +8,14 @@ AC_INIT(export_vars.sh.in) 7@@ -8,15 +8,15 @@
8 AC_CONFIG_HEADER(include/private/apu_config.h) 8 AC_CONFIG_HEADER(include/private/apu_config.h)
9 AC_CONFIG_AUX_DIR(build) 9 AC_CONFIG_AUX_DIR(build)
10 10
@@ -13,6 +13,7 @@ Index: apr-util-1.3.4/configure.in
13-sinclude(build/apu-hints.m4) 13-sinclude(build/apu-hints.m4)
14-sinclude(build/apr_common.m4) 14-sinclude(build/apr_common.m4)
15-sinclude(build/find_apr.m4) 15-sinclude(build/find_apr.m4)
16-sinclude(build/crypto.m4)
16-sinclude(build/dbm.m4) 17-sinclude(build/dbm.m4)
17-sinclude(build/dbd.m4) 18-sinclude(build/dbd.m4)
18-sinclude(build/dso.m4) 19-sinclude(build/dso.m4)
@@ -21,6 +22,7 @@ Index: apr-util-1.3.4/configure.in
21+#sinclude(build/apu-hints.m4) 22+#sinclude(build/apu-hints.m4)
22+#sinclude(build/apr_common.m4) 23+#sinclude(build/apr_common.m4)
23+#sinclude(build/find_apr.m4) 24+#sinclude(build/find_apr.m4)
25+#sinclude(build/crypto.m4)
24+#sinclude(build/dbm.m4) 26+#sinclude(build/dbm.m4)
25+#sinclude(build/dbd.m4) 27+#sinclude(build/dbd.m4)
26+#sinclude(build/dso.m4) 28+#sinclude(build/dso.m4)
diff --git a/meta/recipes-support/apr/apr-util_1.3.12.bb b/meta/recipes-support/apr/apr-util_1.4.1.bb
index 676b1b4efa..d0e19b0a9f 100644
--- a/meta/recipes-support/apr/apr-util_1.3.12.bb
+++ b/meta/recipes-support/apr/apr-util_1.4.1.bb
@@ -9,14 +9,14 @@ LICENSE = "Apache-2.0"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \ 9LIC_FILES_CHKSUM = "file://LICENSE;md5=519e0a18e03f7c023070568c14b077bb \
10 file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42" 10 file://include/apu_version.h;endline=17;md5=806685a84e71f10c80144c48eb35df42"
11 11
12PR = "r2" 12PR = "r0"
13 13
14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ 14SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
15 file://configfix.patch \ 15 file://configfix.patch \
16 file://configure_fixes.patch" 16 file://configure_fixes.patch"
17 17
18SRC_URI[md5sum] = "d1977289889592ef998e3f777f68efe4" 18SRC_URI[md5sum] = "666a5d56098a9debf998510e304c8095"
19SRC_URI[sha256sum] = "815b6fc82950f61050a5e711a7f3c20fd9b6ffcc7a4cacfe9f291fb241210cd8" 19SRC_URI[sha256sum] = "d636d9ef95c6e50e47fc338d532aa375edd11e5d7a3c30dee48beb38ddf4ab4c"
20 20
21EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ 21EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
22 --without-odbc \ 22 --without-odbc \