apr-0.9.7,apr-util-0.9.7: replace unretrieveable 1.1.x versions

  - subversion needs only 0.9.7
  - avoid execution of gen_uri_delims (place uri_delims.h directly)
  - add APACHE_MIRROR to conf/bitbake.conf

5 files changed, 30 insertions, 6 deletions

diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_0.9.7.bb
index 1140ce2cf4..597c0ee93d 100644
--- a/packages/apr/apr-util_1.1.2.bb
+++ b/packages/apr/apr-util_0.9.7.bb
@@ -7,17 +7,19 @@ HOMEPAGE = "http://apr.apache.org"
 
 PR = "r0"
 
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+           file://gen_uri_delims.patch;patch=1 \
+           file://uri_delims.h"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
 
 inherit autotools lib_package binconfig
 
 do_configure() {
+  cp ${S}/../uri_delims.h ${S}/uri/. 
   oe_runconf
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+  oe_libinstall -a -so -C .libs libaprutil-0 ${STAGING_LIBDIR}
 }
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_0.9.7.bb
index ac5d378842..4c236109bb 100644
--- a/packages/apr/apr_1.1.1.bb
+++ b/packages/apr/apr_0.9.7.bb
@@ -6,8 +6,7 @@ HOMEPAGE = "http://apr.apache.org"
 
 PR = "r0"
 
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2"
 
 inherit autotools lib_package binconfig
 
@@ -16,5 +15,5 @@ do_configure() {
 }
 
 do_stage() {
-  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+  oe_libinstall -a -so -C .libs libapr-0 ${STAGING_LIBDIR}
 }
diff --git a/packages/apr/files/.mtn2git_empty b/packages/apr/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/apr/files/.mtn2git_empty
diff --git a/packages/apr/files/gen_uri_delims.patch b/packages/apr/files/gen_uri_delims.patch
new file mode 100644
index 0000000000..57bc15a305
--- /dev/null
+++ b/packages/apr/files/gen_uri_delims.patch
@@ -0,0 +1,7 @@
+--- apr-util-0.9.7/uri/Makefile.in.old	2006-03-11 23:01:09.000000000 +0100
++++ apr-util-0.9.7/uri/Makefile.in	2006-03-11 23:01:28.000000000 +0100
+@@ -15,4 +15,3 @@
+ apr_uri.lo: uri_delims.h apr_uri.c
+ 
+ uri_delims.h: gen_uri_delims
+-	./gen_uri_delims > uri_delims.h
diff --git a/packages/apr/files/uri_delims.h b/packages/apr/files/uri_delims.h
new file mode 100644
index 0000000000..0c855bf726
--- /dev/null
+++ b/packages/apr/files/uri_delims.h
@@ -0,0 +1,16 @@
+/* this file is automatically generated by gen_uri_delims, do not edit */
+static const unsigned char uri_delims[256] = {
+    T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
+    0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
+    0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 
+};