* [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples
@ 2020-06-04 21:35 Fabrice Fontaine
2020-06-04 21:35 ` [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2020-06-04 21:35 UTC (permalink / raw)
To: buildroot
examples are enabled by default since version 0.17.5 and
https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/libhttpserver/libhttpserver.mk | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk
index 1fd76519f4..2c536cf012 100644
--- a/package/libhttpserver/libhttpserver.mk
+++ b/package/libhttpserver/libhttpserver.mk
@@ -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
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0
2020-06-04 21:35 [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Fabrice Fontaine
@ 2020-06-04 21:35 ` Fabrice Fontaine
2020-06-05 7:14 ` Stephan Hoffmann
2020-06-05 7:13 ` [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Stephan Hoffmann
2020-06-06 9:35 ` Yann E. MORIN
2 siblings, 1 reply; 6+ messages in thread
From: Fabrice Fontaine @ 2020-06-04 21:35 UTC (permalink / raw)
To: buildroot
- Remove patch (already in version)
- Update indentation in hash file (two spaces)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...-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
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
deleted file mode 100644
index 74ca58bb31..0000000000
--- a/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash
index 0333aabbae..0791d800b8 100644
--- a/package/libhttpserver/libhttpserver.hash
+++ b/package/libhttpserver/libhttpserver.hash
@@ -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
diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk
index 2c536cf012..170d46b06a 100644
--- a/package/libhttpserver/libhttpserver.mk
+++ b/package/libhttpserver/libhttpserver.mk
@@ -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
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples
2020-06-04 21:35 [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Fabrice Fontaine
2020-06-04 21:35 ` [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0 Fabrice Fontaine
@ 2020-06-05 7:13 ` Stephan Hoffmann
2020-06-21 21:28 ` Peter Korsgaard
2020-06-06 9:35 ` Yann E. MORIN
2 siblings, 1 reply; 6+ messages in thread
From: Stephan Hoffmann @ 2020-06-05 7:13 UTC (permalink / raw)
To: buildroot
Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:
> examples are enabled by default since version 0.17.5 and
> https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Stephan Hoffmann <sho@relinux.de>
> ---
> package/libhttpserver/libhttpserver.mk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk
> index 1fd76519f4..2c536cf012 100644
> --- a/package/libhttpserver/libhttpserver.mk
> +++ b/package/libhttpserver/libhttpserver.mk
> @@ -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
>
--
reLinux - Stephan Hoffmann
Am Schmidtgrund 124 50765 K?ln
Tel. +49.221.95595-19 Fax: -64
www.reLinux.de Stephan at reLinux.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0
2020-06-04 21:35 ` [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0 Fabrice Fontaine
@ 2020-06-05 7:14 ` Stephan Hoffmann
0 siblings, 0 replies; 6+ messages in thread
From: Stephan Hoffmann @ 2020-06-05 7:14 UTC (permalink / raw)
To: buildroot
Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:
> - Remove patch (already in version)
> - Update indentation in hash file (two spaces)
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Stephan Hoffmann <sho@relinux.de>
> ---
> ...-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
>
> 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
> deleted file mode 100644
> index 74ca58bb31..0000000000
> --- a/package/libhttpserver/0001-Fix-lib-expectations-in-libhttpserver.pc.in.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -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/libhttpserver.hash b/package/libhttpserver/libhttpserver.hash
> index 0333aabbae..0791d800b8 100644
> --- a/package/libhttpserver/libhttpserver.hash
> +++ b/package/libhttpserver/libhttpserver.hash
> @@ -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
> diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk
> index 2c536cf012..170d46b06a 100644
> --- a/package/libhttpserver/libhttpserver.mk
> +++ b/package/libhttpserver/libhttpserver.mk
> @@ -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
--
reLinux - Stephan Hoffmann
Am Schmidtgrund 124 50765 K?ln
Tel. +49.221.95595-19 Fax: -64
www.reLinux.de Stephan at reLinux.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples
2020-06-04 21:35 [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Fabrice Fontaine
2020-06-04 21:35 ` [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0 Fabrice Fontaine
2020-06-05 7:13 ` [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Stephan Hoffmann
@ 2020-06-06 9:35 ` Yann E. MORIN
2 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2020-06-06 9:35 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-06-04 23:35 +0200, Fabrice Fontaine spake thusly:
> examples are enabled by default since version 0.17.5 and
> https://github.com/etr/libhttpserver/commit/012d014a7c52ef91a35c521d5d4f83ee11de5068
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Both applied to master, thanks.
> ---
> package/libhttpserver/libhttpserver.mk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/package/libhttpserver/libhttpserver.mk b/package/libhttpserver/libhttpserver.mk
> index 1fd76519f4..2c536cf012 100644
> --- a/package/libhttpserver/libhttpserver.mk
> +++ b/package/libhttpserver/libhttpserver.mk
> @@ -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
>
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples
2020-06-05 7:13 ` [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Stephan Hoffmann
@ 2020-06-21 21:28 ` Peter Korsgaard
0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2020-06-21 21:28 UTC (permalink / raw)
To: buildroot
>>>>> "Stephan" == Stephan Hoffmann <sho@relinux.de> writes:
> Am 04.06.20 um 23:35 schrieb Fabrice Fontaine:
>> 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.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-21 21:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-04 21:35 [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Fabrice Fontaine
2020-06-04 21:35 ` [Buildroot] [PATCH 2/2] package/libhttpserver: bump to version 0.18.0 Fabrice Fontaine
2020-06-05 7:14 ` Stephan Hoffmann
2020-06-05 7:13 ` [Buildroot] [PATCH 1/2] package/libhttpserver: disable examples Stephan Hoffmann
2020-06-21 21:28 ` Peter Korsgaard
2020-06-06 9:35 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.