From patchwork Thu May 12 11:01:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [40/54] apr-util: Add Upstream-Status Date: Thu, 12 May 2011 11:01:37 -0000 From: Zhai, Edwin X-Patchwork-Id: 3849 Message-Id: <96ea33e795d0aae2066c83a9be4c3dfb6d15d854.1305197864.git.edwin.zhai@intel.com> To: openembedded-core@lists.openembedded.org Cc: From: Zhai Edwin Signed-off-by: Zhai Edwin --- meta/recipes-support/apr/apr-util/configfix.patch | 2 + .../apr/apr-util/configure_fixes.patch | 2 + .../apr/apr-util/configure_fixes.patch.old | 25 -------------------- 3 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-support/apr/apr-util/configure_fixes.patch.old diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch index a8953e5..dbb1148 100644 --- a/meta/recipes-support/apr/apr-util/configfix.patch +++ b/meta/recipes-support/apr/apr-util/configfix.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: apr-util-1.3.4/apu-config.in =================================================================== --- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000 diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch b/meta/recipes-support/apr/apr-util/configure_fixes.patch index 0b2a090..1925236 100644 --- a/meta/recipes-support/apr/apr-util/configure_fixes.patch +++ b/meta/recipes-support/apr/apr-util/configure_fixes.patch @@ -1,3 +1,5 @@ +Upstream-Status: Inappropriate [configuration] + Index: apr-util-1.3.4/configure.in =================================================================== --- apr-util-1.3.4.orig/configure.in diff --git a/meta/recipes-support/apr/apr-util/configure_fixes.patch.old b/meta/recipes-support/apr/apr-util/configure_fixes.patch.old deleted file mode 100644 index 16f88b3..0000000 --- a/meta/recipes-support/apr/apr-util/configure_fixes.patch.old +++ /dev/null @@ -1,25 +0,0 @@ -Index: apr-util-1.2.12/configure.in -=================================================================== ---- apr-util-1.2.12.orig/configure.in 2008-03-08 19:15:00.000000000 +0000 -+++ apr-util-1.2.12/configure.in 2008-03-08 19:15:13.000000000 +0000 -@@ -8,13 +8,13 @@ - AC_CONFIG_HEADER(include/private/apu_config.h) - AC_CONFIG_AUX_DIR(build) - --sinclude(build/apu-conf.m4) --sinclude(build/apu-iconv.m4) --sinclude(build/apu-hints.m4) --sinclude(build/apr_common.m4) --sinclude(build/find_apr.m4) --sinclude(build/dbm.m4) --sinclude(build/dbd.m4) -+#sinclude(build/apu-conf.m4) -+#sinclude(build/apu-iconv.m4) -+#sinclude(build/apu-hints.m4) -+#sinclude(build/apr_common.m4) -+#sinclude(build/find_apr.m4) -+#sinclude(build/dbm.m4) -+#sinclude(build/dbd.m4) - - dnl Generate ./config.nice for reproducing runs of configure - dnl