Thanks, applied as 44dc6d6a3111c379afb2349abb3caa9fb92e2355. Michael
[sent from post-receive hook] On Fri, 10 Dec 2021 14:07:14 +0100, Alexander Dahl <[email protected]> wrote: > License options depend on whether gnutls is linked or not. > > Signed-off-by: Alexander Dahl <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make > index 2a4700ead249..313a52c9b751 100644 > --- a/rules/libmicrohttpd.make > +++ b/rules/libmicrohttpd.make > @@ -22,7 +22,17 @@ LIBMICROHTTPD_SUFFIX := tar.gz > LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, > libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)) > LIBMICROHTTPD_SOURCE := $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX) > LIBMICROHTTPD_DIR := $(BUILDDIR)/$(LIBMICROHTTPD) > + > +LIBMICROHTTPD_LICENSE_FILES := \ > + > file://README;startline=10;endline=11;md5=c6f1444a4efd67e04f3452dc1e97c24d \ > + file://COPYING;md5=57d09285feac8a64efa878e692b14f36 > +ifdef PTXCONF_LIBMICROHTTPD_HTTPS > +LIBMICROHTTPD_LICENSE := LGPL-2.1-only > +else > LIBMICROHTTPD_LICENSE := LGPL-2.1-only OR GPL-2.0-only WITH > eCos-exception-2.0 > +LIBMICROHTTPD_LICENSE_FILES += \ > + file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1 > +endif > > # > ---------------------------------------------------------------------------- > # Prepare _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
