diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2014-02-14 20:48:59 -0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-02-21 17:07:00 +0100 |
| commit | 752f6ba6e40b6e7b4e0931af58e98a4c95d0bb81 (patch) | |
| tree | 89176d1e85a18f51e7a2b31343321b97d639808d | |
| parent | 0477432cce69eef73744e46855b0449bd56b3297 (diff) | |
| download | meta-openembedded-contrib-752f6ba6e40b6e7b4e0931af58e98a4c95d0bb81.tar.gz | |
libmicrohttpd: upgrade to 0.9.33
libmicrohttpd is needed by systemd-journald-gatewayd
Remove older recipes and move to recipes-support
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
3 files changed, 26 insertions, 32 deletions
diff --git a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb b/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb deleted file mode 100644 index ebaa485366..0000000000 --- a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.4.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" - -DEPENDS = "libgcrypt curl" - -# ftp://ftp.nluug.nl/pub/gnu/${PN}/ has only 0.9.* and newer now -SRC_URI = "http://mirrors.usc.edu/pub/gnu/${PN}/${P}.tar.gz" -SRC_URI[md5sum] = "61698da6aa04744ea076c327f66fc05a" -SRC_URI[sha256sum] = "0cb09e26678d1531a4fd40a748abff5142bfdad3ae11cfe3bb7ad7317a99e371" - -inherit autotools lib_package - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.9.27.bb b/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.9.27.bb deleted file mode 100644 index 802ae40235..0000000000 --- a/meta-oe/recipes-connectivity/libmicrohttpd/libmicrohttpd_0.9.27.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "GNU libmicrohttpd is a small C library that is supposed to make it easy to run an HTTP server as part of another application." -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" - -DEPENDS = "libgcrypt curl" - -SRC_URI = "ftp://ftp.nluug.nl/pub/gnu/libmicrohttpd//libmicrohttpd-${PV}.tar.gz" -SRC_URI[md5sum] = "a10496b7f1b495aaf6897584da52f51b" -SRC_URI[sha256sum] = "d532edf64c3a9da472114c2d10fc94606e3b31f21b883ec2e796ab8478f7e9cb" - - -inherit autotools lib_package - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb new file mode 100644 index 0000000000..523b8dd4ec --- /dev/null +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.33.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" +SECTION = "net" +DEPENDS = "libgcrypt gnutls" + +SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "013b10f9de1cda5448b29c81305354a3" +SRC_URI[sha256sum] = "d9587e8497548f820650cd607daf3615ea3272435779378983032c570f1cd559" + +inherit autotools lib_package + +EXTRA_OECONF += "-disable-static --enable-gnutls" + +PACKAGECONFIG ?= "curl" +PACKAGECONFIG_append_class-target = "\ + ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," + +do_compile_append() { + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc +} + |