summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2016-05-24 12:49:00 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-05-26 08:27:27 +0200
commit03aac15241bab441c7802bbabe659a2305809196 (patch)
treefd3e3267349eb9c0486553ab5a3311b54e7670e9 /patches
parentc2a245521cbc76d7bc5c23ef9e1af5e68d743b2d (diff)
downloadptxdist-03aac15241bab441c7802bbabe659a2305809196.tar.gz
ptxdist-03aac15241bab441c7802bbabe659a2305809196.tar.xz
libmicrohttp: remove from staging by updating to a current release
Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch37
l---------patches/libmicrohttpd-0.9.49/autogen.sh1
-rw-r--r--patches/libmicrohttpd-0.9.49/series4
3 files changed, 42 insertions, 0 deletions
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 000000000..358c23c06
--- /dev/null
+++ b/patches/libmicrohttpd-0.9.49/0001-Do-not-compile-tests-for-disabled-features.patch
@@ -0,0 +1,37 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Mon, 18 Apr 2016 15:58:59 +0200
+Subject: [PATCH] Do not compile tests for disabled features
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ 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 000000000..9f8a4cb7d
--- /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 000000000..f8bfab519
--- /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