diff options
| author | Oyvind Repvik <nail@nslu2-linux.org> | 2006-03-14 22:34:13 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-14 22:34:13 +0000 |
| commit | 9e47d0f0ad0f9903550c50fdb59f773ee0b76ab6 (patch) | |
| tree | fc2e025013c14d1d55bceeb3f8dbea310e9dab46 /packages | |
| parent | 9673c57c71bd1b4ea8ab4736d5732134f2f4de7d (diff) | |
| parent | ea6a78777bc9c0a961cd79730da2561c34089362 (diff) | |
merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c
and 27b9c5adc9f3c8d43d5702469feb4aef564a14c4
Diffstat (limited to 'packages')
115 files changed, 1957 insertions, 384 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 +}; diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index 4dd40b2157..301ac24cb2 100644 --- a/packages/dropbear/dropbear.inc +++ b/packages/dropbear/dropbear.inc @@ -18,7 +18,7 @@ inherit autotools update-rc.d INITSCRIPT_NAME = "dropbear" INITSCRIPT_PARAMS = "defaults 10" -CFLAGS_prepend = "-D_GNU_SOURCE -I. " +CFLAGS_prepend = " -I. " LD = "${CC}" SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" diff --git a/packages/dropbear/dropbear_0.45.bb b/packages/dropbear/dropbear_0.45.bb index 68c6e87e75..8daf54aac3 100644 --- a/packages/dropbear/dropbear_0.45.bb +++ b/packages/dropbear/dropbear_0.45.bb @@ -1,4 +1,4 @@ -require dropbear.inc +include dropbear.inc PR = "r4" diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb index d34787fa64..9aed2dc976 100644 --- a/ |