| Message ID | 20190924122754.15416-1-stephan.hoffmann@ext.grandcentrix.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] libhttpserver: new package | expand |
On Tue, 24 Sep 2019 14:27:54 +0200 <stephan.hoffmann@ext.grandcentrix.net> wrote: > From: Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net> > > libhttpserver is a C++ library for building high performance RESTfuls > web servers. libhttpserver is built upon libmicrohttpd to provide a > simple API for developers to create HTTP services in C++. > > The installed pkg-config file contains an error, thus we include > the patch 458d16b922304006fe418897044e14b0544a127a from the upstream > repo that is not yet released. > > Signed-off-by: Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net> I've applied, after making a few small changes. First, the commit title prefix for package-related changes should always be "package/<pkg>: <something>". > diff --git a/package/libhttpserver/Config.in b/package/libhttpserver/Config.in > new file mode 100644 > index 0000000000..7105dc67f2 > --- /dev/null > +++ b/package/libhttpserver/Config.in > @@ -0,0 +1,15 @@ > +config BR2_PACKAGE_LIBHTTPSERVER > + bool "libhttpserver" > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HAS_THREADS > + select BR2_PACKAGE_LIBMICROHTTPD > + help > + libhttpserver is a C++ library for building high performance > + RESTfuls web servers. libhttpserver is built upon > + libmicrohttpd to provide a simple API for developers to > + create HTTP services in C++. > + > + https://github.com/etr/libhttpserver > + > +comment "libhttpserver needs a toolchain w/ C++, threads" > + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) We more commonly write: depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS It is obviously exactly the same from a boolean point of view, but it's what we use in the vast majority of packages. > +LIBHTTPSERVER_VERSION = 0.17.5 > +LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) > +LIBHTTPSERVER_LICENSE = LGPL-2.1-or-later We use LGPL-2.1+. I know it's not what SPDX recommends, but that's what Buildroot uses, and we should be consistent across packages. Thanks, Thomas
diff --git a/DEVELOPERS b/DEVELOPERS index b427fd92ae..e57bda4dae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2179,6 +2179,9 @@ F: package/gtest/ F: package/mtdev/ F: package/mtdev2tuio/ +N: Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net> +F: package/libhttpserver/ + N: Steve Calfee <stevecalfee@gmail.com> F: package/python-pymysql/ F: package/python-pyratemp/ diff --git a/package/Config.in b/package/Config.in index 2fc11065f6..e6ee550e7a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1584,6 +1584,7 @@ menu "Networking" source "package/libgsasl/Config.in" source "package/libhtp/Config.in" source "package/libhttpparser/Config.in" + source "package/libhttpserver/Config.in" source "package/libidn/Config.in" source "package/libidn2/Config.in" source "package/libiscsi/Config.in" diff --git a/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch b/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch new file mode 100644 index 0000000000..74ca58bb31 --- /dev/null +++ b/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch @@ -0,0 +1,27 @@ +From 2bc7cf0beb6b8a124c1c7360c4fb5279e8763f07 Mon Sep 17 00:00:00 2001 +From: Sebastiano Merlino <electrictwister2000@gmail.com> +Date: Sat, 8 Jun 2019 15:36:06 -0700 +Subject: [PATCH] Fix lib expectations in libhttpserver.pc.in + +Signed-off-by: Stephan Hoffmann <stephan.hoffmann@ext.grandcentrix.net> +--- +Patch status: upstream commit 458d16b922304006fe418897044e14 + + libhttpserver.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libhttpserver.pc.in b/libhttpserver.pc.in +index 36355ee..55f7c0e 100644 +--- a/libhttpserver.pc.in ++++ b/libhttpserver.pc.in +@@ -8,6 +8,6 @@ Description: A C++ library for creating an embedded Rest HTTP server + Version: @VERSION@ + Requires: libmicrohttpd >= 0.9.37 + Conflicts: +-Libs: -L${libdir} -lmicrohttpd ++Libs: -L${libdir} -lhttpserver + Libs.private: @LHT_LIBDEPS@ + Cflags: -I${includedir} -I${includedir}/httpserver +-- +2.17.1 + diff --git a/package/libhttpserver/Config.in b/package/libhttpserver/Config.in new file mode 100644 index 0000000000..7105dc67f2 --- /dev/null +++ b/package/libhttpserver/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_LIBHTTPSERVER + bool "libhttpserver" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBMICROHTTPD + help + libhttpserver is a C++ library for building high performance + RESTfuls web servers. libhttpserver is built upon + libmicrohttpd to provide a simple API for developers to + create HTTP services in C++. + + https://github.com/etr/libhttpserver + +comment "libhttpserver needs a toolchain w/ C++, threads" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/libhttpserver/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash new file mode 100644 index 0000000000..0333aabbae --- /dev/null +++ b/package/libhttpserver/libhttpserver.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk new file mode 100644 index 0000000000..1640c05e35 --- /dev/null +++ b/package/libhttpserver/libhttpserver.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# libhttpserver +# +################################################################################ + +LIBHTTPSERVER_VERSION = 0.17.5 +LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION)) +LIBHTTPSERVER_LICENSE = LGPL-2.1-or-later +LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER +LIBHTTPSERVER_INSTALL_STAGING = YES +LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build +LIBHTTPSERVER_AUTORECONF = YES +LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd + +$(eval $(autotools-package))