Signed-off-by: Juergen Borleis <[email protected]> --- ...o-not-compile-tests-for-disabled-features.patch | 37 ++++++++++++++++++++++ patches/libmicrohttpd-0.9.49/autogen.sh | 1 + patches/libmicrohttpd-0.9.49/series | 4 +++ rules/libmicrohttpd.in | 17 ++-------- rules/libmicrohttpd.make | 14 ++++---- 5 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch create mode 120000 patches/libmicrohttpd-0.9.49/autogen.sh create mode 100644 patches/libmicrohttpd-0.9.49/series
diff --git a/patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch b/patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch new file mode 100644 index 0000000..358c23c --- /dev/null +++ b/patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch @@ -0,0 +1,37 @@ +From: Juergen Borleis <[email protected]> +Date: Mon, 18 Apr 2016 15:58:59 +0200 +Subject: [PATCH] Do not compile tests for disabled features + +Signed-off-by: Juergen Borleis <[email protected]> +--- + doc/examples/Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am +index 7bb02daccda0..1866188f61b5 100644 +--- a/doc/examples/Makefile.am ++++ b/doc/examples/Makefile.am +@@ -12,7 +12,6 @@ endif + + # example programs + noinst_PROGRAMS = \ +- basicauthentication \ + hellobrowser \ + logging \ + responseheaders +@@ -29,10 +28,15 @@ if HAVE_W32 + AM_CPPFLAGS += -DWINDOWS + endif + ++if ENABLE_BAUTH ++noinst_PROGRAMS += \ ++ basicauthentication ++ + basicauthentication_SOURCES = \ + basicauthentication.c + basicauthentication_LDADD = \ + $(top_builddir)/src/microhttpd/libmicrohttpd.la ++endif + + hellobrowser_SOURCES = \ + hellobrowser.c diff --git a/patches/libmicrohttpd-0.9.49/autogen.sh b/patches/libmicrohttpd-0.9.49/autogen.sh new file mode 120000 index 0000000..9f8a4cb --- /dev/null +++ b/patches/libmicrohttpd-0.9.49/autogen.sh @@ -0,0 +1 @@ +../autogen.sh \ No newline at end of file diff --git a/patches/libmicrohttpd-0.9.49/series b/patches/libmicrohttpd-0.9.49/series new file mode 100644 index 0000000..f8bfab5 --- /dev/null +++ b/patches/libmicrohttpd-0.9.49/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Do-not-compile-tests-for-disabled-features.patch +# 502fecbd4d242ba6649ff061c5e9ac48 - git-ptx-patches magic diff --git a/rules/libmicrohttpd.in b/rules/libmicrohttpd.in index dc4deb6..ea65015 100644 --- a/rules/libmicrohttpd.in +++ b/rules/libmicrohttpd.in @@ -1,10 +1,9 @@ -## SECTION=staging -## old section: -### SECTION=networking +## SECTION=networking menuconfig LIBMICROHTTPD tristate - select LIBC_PTHREAD + select LIBC_PTHREAD if RUNTIME + select GNUTLS if LIBMICROHTTPD_HTTPS select LIBGCRYPT if LIBMICROHTTPD_HTTPS prompt "libmicrohttpd " help @@ -14,10 +13,6 @@ menuconfig LIBMICROHTTPD functionality into applications. It will be used in future GNUnet versions as part of the HTTP transport. - STAGING: remove in ptxdist-2016.08.0 - Upstream is at revision 0.9 and the archives for 0.4.4 seems no longer - available. - if LIBMICROHTTPD config LIBMICROHTTPD_HTTPS @@ -29,12 +24,6 @@ config LIBMICROHTTPD_HTTPS If you disable HTTPS/SSL support, you can also choose the eCos License. -config LIBMICROHTTPD_CLIENT_SIDE - bool - prompt "Client side support" - help - FIXME - config LIBMICROHTTPD_MESSAGES bool prompt "Messages" diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make index 72f7733..c73658d 100644 --- a/rules/libmicrohttpd.make +++ b/rules/libmicrohttpd.make @@ -1,6 +1,7 @@ # -*-makefile-*- # # Copyright (C) 2008, 2009 by Erwin Rol +# Copyright (C) 2016 by Juergen Borleis # # See CREDITS for details about who has contributed to this project. # @@ -16,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBMICROHTTPD) += libmicrohttpd # # Paths and names # -LIBMICROHTTPD_VERSION := 0.4.4 -LIBMICROHTTPD_MD5 := bcd61ebb10286379f55c7db9c79e0465 +LIBMICROHTTPD_VERSION := 0.9.49 +LIBMICROHTTPD_MD5 := 3209aa2ac6199b874a6325342b86edbc LIBMICROHTTPD := libmicrohttpd-$(LIBMICROHTTPD_VERSION) LIBMICROHTTPD_SUFFIX := tar.gz LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)) @@ -38,10 +39,11 @@ LIBMICROHTTPD_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ $(GLOBAL_LARGE_FILE_OPTION) \ --disable-curl \ - --disable-coverage \ + --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_MESSAGES)-messages \ --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_HTTPS)-https \ - --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_CLIENT_SIDE)-client-side \ - --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_MESSAGES)-messages + --disable-bauth \ + --disable-dauth \ + --disable-coverage # ---------------------------------------------------------------------------- # Target-Install @@ -54,7 +56,7 @@ $(STATEDIR)/libmicrohttpd.targetinstall: @$(call install_fixup, libmicrohttpd,PRIORITY,optional) @$(call install_fixup, libmicrohttpd,SECTION,base) @$(call install_fixup, libmicrohttpd,AUTHOR,"Erwin Rol <[email protected]>") - @$(call install_fixup, libmicrohttpd,DESCRIPTION,missing) + @$(call install_fixup, libmicrohttpd,DESCRIPTION,"embedded HTTP server functionality") @$(call install_lib, libmicrohttpd, 0, 0, 0644, libmicrohttpd) -- 2.8.1 _______________________________________________ ptxdist mailing list [email protected]
