Skip to contentSkip to conversation

package/libhttpserver: disable examples

PATCH New Fabrice Fontaine 4 participants 6 messages Jun 4, 2020 – Jun 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libhttpserver: disable examples

examples are enabled by default since version 0.17.5 and
https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068

---
 package/libhttpserver/libhttpserver.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/libhttpserver/libhttpserver.mk +3 -1
index 1fd76519f4..2c536cf012 100644
@@ -9,7 +9,9 @@ LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION))
 LIBHTTPSERVER_LICENSE = LGPL-2.1+
 LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER
 LIBHTTPSERVER_INSTALL_STAGING = YES
-LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build
+LIBHTTPSERVER_CONF_OPTS = \
+	--disable-examples \
+	--enable-same-directory-build
 LIBHTTPSERVER_AUTORECONF = YES
 LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd
 
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/2 package/libhttpserver: bump to version 0.18.0

- Remove patch (already in version)
- Update indentation in hash file (two spaces)

---
 ...-expectations-in-libhttpserver.pc.in.patch | 27 -------------------
 package/libhttpserver/libhttpserver.hash      |  4 +--
 package/libhttpserver/libhttpserver.mk        |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch deleted +0 -27
deleted file mode 100644
index 74ca58bb31..0000000000
@@ -1,27 +0,0 @@
-From 2bc7cf0beb6b8a124c1c7360c4fb5279e8763f07 Mon Sep 17 00:00:00 2001
-From: Sebastiano Merlino <[email protected]>
-Date: Sat, 8 Jun 2019 15:36:06 -0700
-Subject: [PATCH] Fix lib expectations in libhttpserver.pc.in
-
-Signed-off-by: Stephan Hoffmann <[email protected]>
----
-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
-
package/libhttpserver/libhttpserver.hash +2 -2
index 0333aabbae..0791d800b8 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz
-sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER
+sha256  b4a745a9f32a1ac02b545c062fc85342a655c3770cd8d4d7218f34509ea27d98  libhttpserver-0.18.0.tar.gz
+sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING.LESSER
package/libhttpserver/libhttpserver.mk +1 -1
index 2c536cf012..170d46b06a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBHTTPSERVER_VERSION = 0.17.5
+LIBHTTPSERVER_VERSION = 0.18.0
 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION))
 LIBHTTPSERVER_LICENSE = LGPL-2.1+
 LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/2 package/libhttpserver: bump to version 0.18.0

Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:

Quoted 4 lines

- Remove patch (already in version)
- Update indentation in hash file (two spaces)

Quoted 63 lines
---
 ...-expectations-in-libhttpserver.pc.in.patch | 27 -------------------
 package/libhttpserver/libhttpserver.hash      |  4 +--
 package/libhttpserver/libhttpserver.mk        |  2 +-
 3 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch deleted +0 -27
deleted file mode 100644
index 74ca58bb31..0000000000
@@ -1,27 +0,0 @@
-From 2bc7cf0beb6b8a124c1c7360c4fb5279e8763f07 Mon Sep 17 00:00:00 2001
-From: Sebastiano Merlino <[email protected]>
-Date: Sat, 8 Jun 2019 15:36:06 -0700
-Subject: [PATCH] Fix lib expectations in libhttpserver.pc.in
-
-Signed-off-by: Stephan Hoffmann <[email protected]>
----
-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
-
package/libhttpserver/libhttpserver.hash +2 -2
index 0333aabbae..0791d800b8 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 778fa0aec199bf8737b2d540c2563a694c18957329f9885e372f7aaafb838351 libhttpserver-0.17.5.tar.gz
-sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING.LESSER
+sha256  b4a745a9f32a1ac02b545c062fc85342a655c3770cd8d4d7218f34509ea27d98  libhttpserver-0.18.0.tar.gz
+sha256  5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING.LESSER
package/libhttpserver/libhttpserver.mk +1 -1
index 2c536cf012..170d46b06a 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBHTTPSERVER_VERSION = 0.17.5
+LIBHTTPSERVER_VERSION = 0.18.0
 LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION))
 LIBHTTPSERVER_LICENSE = LGPL-2.1+
 LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER
Signature · 4 lines
reLinux     -    Stephan Hoffmann
Am Schmidtgrund 124    50765 K?ln
Tel. +49.221.95595-19    Fax: -64
www.reLinux.de Stephan at reLinux.de
#3 lore raw

PATCH 1/2 package/libhttpserver: disable examples

In reply to Fabrice Fontaine

Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:

Quoted 4 lines

examples are enabled by default since version 0.17.5 and
https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068

Quoted 19 lines
---
 package/libhttpserver/libhttpserver.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/libhttpserver/libhttpserver.mk +3 -1
index 1fd76519f4..2c536cf012 100644
@@ -9,7 +9,9 @@ LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION))
 LIBHTTPSERVER_LICENSE = LGPL-2.1+
 LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER
 LIBHTTPSERVER_INSTALL_STAGING = YES
-LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build
+LIBHTTPSERVER_CONF_OPTS = \
+	--disable-examples \
+	--enable-same-directory-build
 LIBHTTPSERVER_AUTORECONF = YES
 LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd
 
Signature · 4 lines
reLinux     -    Stephan Hoffmann
Am Schmidtgrund 124    50765 K?ln
Tel. +49.221.95595-19    Fax: -64
www.reLinux.de Stephan at reLinux.de
#4 lore raw

PATCH 1/2 package/libhttpserver: disable examples

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Stephan" == Stephan Hoffmann <[email protected]> writes:

Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:

Quoted 2 lines

examples are enabled by default since version 0.17.5 and
https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 package/libhttpserver: disable examples

In reply to Fabrice Fontaine

Fabrice, All,

On 2020-06-04 23:35 +0200, Fabrice Fontaine spake thusly:

Quoted 4 lines

examples are enabled by default since version 0.17.5 and
https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068

Both applied to master, thanks.

Quoted 26 lines
---
 package/libhttpserver/libhttpserver.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/libhttpserver/libhttpserver.mk +3 -1
index 1fd76519f4..2c536cf012 100644
@@ -9,7 +9,9 @@ LIBHTTPSERVER_SITE = $(call github,etr,libhttpserver,$(LIBHTTPSERVER_VERSION))
 LIBHTTPSERVER_LICENSE = LGPL-2.1+
 LIBHTTPSERVER_LICENSE_FILES = COPYING.LESSER
 LIBHTTPSERVER_INSTALL_STAGING = YES
-LIBHTTPSERVER_CONF_OPTS = --enable-same-directory-build
+LIBHTTPSERVER_CONF_OPTS = \
+	--disable-examples \
+	--enable-same-directory-build
 LIBHTTPSERVER_AUTORECONF = YES
 LIBHTTPSERVER_DEPENDENCIES = libmicrohttpd
 
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'