summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/apr
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/apr')
-rw-r--r--meta/recipes-support/apr/apr-util/configfix.patch2
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch2
-rw-r--r--meta/recipes-support/apr/apr-util/configure_fixes.patch.old25
-rw-r--r--meta/recipes-support/apr/apr/buildconf_fix.patch2
-rw-r--r--meta/recipes-support/apr/apr/cleanup.patch2
-rw-r--r--meta/recipes-support/apr/apr/configfix.patch2
-rw-r--r--meta/recipes-support/apr/apr/configure_fixes.patch2
7 files changed, 12 insertions, 25 deletions
diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch
index a8953e5244..dbb1148809 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 0b2a0903e1..19252363ab 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 16f88b3bba..0000000000
--- 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
diff --git a/meta/recipes-support/apr/apr/buildconf_fix.patch b/meta/recipes-support/apr/apr/buildconf_fix.patch
index 641340b2a4..2c9d62e7a1 100644
--- a/meta/recipes-support/apr/apr/buildconf_fix.patch
+++ b/meta/recipes-support/apr/apr/buildconf_fix.patch
@@ -4,6 +4,8 @@ so fall back to old detection.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/buildconf
===================================================================
--- apr-1.4.2.orig/buildconf 2009-11-13 06:19:49.000000000 +0800
diff --git a/meta/recipes-support/apr/apr/cleanup.patch b/meta/recipes-support/apr/apr/cleanup.patch
index 47f1c42c5c..b6784e015d 100644
--- a/meta/recipes-support/apr/apr/cleanup.patch
+++ b/meta/recipes-support/apr/apr/cleanup.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.4.2/build/buildcheck.sh
===================================================================
--- apr-1.4.2.orig/build/buildcheck.sh 2009-11-13 08:27:16.000000000 +0800
diff --git a/meta/recipes-support/apr/apr/configfix.patch b/meta/recipes-support/apr/apr/configfix.patch
index 995555e8ba..605c4f632c 100644
--- a/meta/recipes-support/apr/apr/configfix.patch
+++ b/meta/recipes-support/apr/apr/configfix.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/apr-config.in
===================================================================
--- apr-1.3.3.orig/apr-config.in 2009-01-12 15:16:31.000000000 +0000
diff --git a/meta/recipes-support/apr/apr/configure_fixes.patch b/meta/recipes-support/apr/apr/configure_fixes.patch
index 86ceb8cf08..0514000599 100644
--- a/meta/recipes-support/apr/apr/configure_fixes.patch
+++ b/meta/recipes-support/apr/apr/configure_fixes.patch
@@ -1,3 +1,5 @@
+Upstream-Status: Inappropriate [configuration]
+
Index: apr-1.3.3/configure.in
===================================================================
--- apr-1.3.3.orig/configure.in