* [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0
@ 2021-06-07 2:42 Jianhui Zhao
2021-06-07 2:42 ` [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.1 Jianhui Zhao
0 siblings, 1 reply; 5+ messages in thread
From: Jianhui Zhao @ 2021-06-07 2:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
---
package/libuhttpd/libuhttpd.hash | 2 +-
package/libuhttpd/libuhttpd.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash
index 4b0b5027c6..19a02e5be0 100644
--- a/package/libuhttpd/libuhttpd.hash
+++ b/package/libuhttpd/libuhttpd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz
+sha256 dcd95fac7b29d43f57e942db6e9fb4c8745d4284684cd627d60c8a7f8c76cd32 libuhttpd-3.11.0.tar.gz
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk
index 326c78face..61afec701e 100644
--- a/package/libuhttpd/libuhttpd.mk
+++ b/package/libuhttpd/libuhttpd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUHTTPD_VERSION = 3.10.1
+LIBUHTTPD_VERSION = 3.11.0
LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
LIBUHTTPD_LICENSE = MIT
LIBUHTTPD_LICENSE_FILES = LICENSE
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.1
2021-06-07 2:42 [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0 Jianhui Zhao
@ 2021-06-07 2:42 ` Jianhui Zhao
2021-06-20 13:44 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Jianhui Zhao @ 2021-06-07 2:42 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
---
package/libuhttpd/libuhttpd.hash | 2 +-
package/libuhttpd/libuhttpd.mk | 27 ++++++---------------------
2 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash
index 4b0b5027c6..98bd6e513b 100644
--- a/package/libuhttpd/libuhttpd.hash
+++ b/package/libuhttpd/libuhttpd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz
+sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk
index 326c78face..782e04a257 100644
--- a/package/libuhttpd/libuhttpd.mk
+++ b/package/libuhttpd/libuhttpd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUHTTPD_VERSION = 3.10.1
+LIBUHTTPD_VERSION = 3.12.1
LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
LIBUHTTPD_LICENSE = MIT
LIBUHTTPD_LICENSE_FILES = LICENSE
@@ -13,34 +13,19 @@ LIBUHTTPD_DEPENDENCIES = libev
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBUHTTPD_DEPENDENCIES += openssl
-LIBUHTTPD_CONF_OPTS += \
- -DUHTTPD_SSL_SUPPORT=ON \
- -DUHTTPD_USE_MBEDTLS=OFF \
- -DUHTTPD_USE_OPENSSL=ON \
- -DUHTTPD_USE_WOLFSSL=OFF
+LIBUHTTPD_CONF_OPTS += -DUSE_OPENSSL=ON
else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
LIBUHTTPD_DEPENDENCIES += wolfssl
-LIBUHTTPD_CONF_OPTS += \
- -DUHTTPD_SSL_SUPPORT=ON \
- -DUHTTPD_USE_MBEDTLS=OFF \
- -DUHTTPD_USE_OPENSSL=OFF \
- -DUHTTPD_USE_WOLFSSL=ON
+LIBUHTTPD_CONF_OPTS += -DUSE_WOLFSSL=ON
else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
LIBUHTTPD_DEPENDENCIES += mbedtls
-LIBUHTTPD_CONF_OPTS += \
- -DUHTTPD_SSL_SUPPORT=ON \
- -DUHTTPD_USE_MBEDTLS=ON \
- -DUHTTPD_USE_OPENSSL=OFF \
- -DUHTTPD_USE_WOLFSSL=OFF
+LIBUHTTPD_CONF_OPTS += -DUSE_MBEDTLS=ON
else
-LIBUHTTPD_CONF_OPTS += -DUHTTPD_SSL_SUPPORT=OFF
+LIBUHTTPD_CONF_OPTS += -DSSL_SUPPORT=OFF
endif
-# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
-LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
-else ifeq ($(BR2_SHARED_LIBS),y)
-LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
+LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=ON
endif
$(eval $(cmake-package))
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.1
2021-06-07 2:42 ` [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.1 Jianhui Zhao
@ 2021-06-20 13:44 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2021-06-20 13:44 UTC (permalink / raw)
To: buildroot
On 07/06/2021 04:42, Jianhui Zhao wrote:
> Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
> ---
> package/libuhttpd/libuhttpd.hash | 2 +-
> package/libuhttpd/libuhttpd.mk | 27 ++++++---------------------
> 2 files changed, 7 insertions(+), 22 deletions(-)
>
> diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash
> index 4b0b5027c6..98bd6e513b 100644
> --- a/package/libuhttpd/libuhttpd.hash
> +++ b/package/libuhttpd/libuhttpd.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz
You previously submitted a patch that bumped it to 3.11.1, which was applied to
the 'next' branch. Therefore, you should have based your patch on the 'next' branch.
> +sha256 c234dd3d491c4daa047e28870c6e740529b2eff2dd027dafb6bf02d8dba286b0 libuhttpd-3.12.1.tar.gz
> sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
> diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk
> index 326c78face..782e04a257 100644
> --- a/package/libuhttpd/libuhttpd.mk
> +++ b/package/libuhttpd/libuhttpd.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBUHTTPD_VERSION = 3.10.1
> +LIBUHTTPD_VERSION = 3.12.1
> LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
> LIBUHTTPD_LICENSE = MIT
> LIBUHTTPD_LICENSE_FILES = LICENSE
> @@ -13,34 +13,19 @@ LIBUHTTPD_DEPENDENCIES = libev
>
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> LIBUHTTPD_DEPENDENCIES += openssl
> -LIBUHTTPD_CONF_OPTS += \
> - -DUHTTPD_SSL_SUPPORT=ON \
> - -DUHTTPD_USE_MBEDTLS=OFF \
> - -DUHTTPD_USE_OPENSSL=ON \
> - -DUHTTPD_USE_WOLFSSL=OFF
> +LIBUHTTPD_CONF_OPTS += -DUSE_OPENSSL=ON
This change shouldn't have been made. We want to be explicit about the options
that are turned on and off.
> else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
> LIBUHTTPD_DEPENDENCIES += wolfssl
> -LIBUHTTPD_CONF_OPTS += \
> - -DUHTTPD_SSL_SUPPORT=ON \
> - -DUHTTPD_USE_MBEDTLS=OFF \
> - -DUHTTPD_USE_OPENSSL=OFF \
> - -DUHTTPD_USE_WOLFSSL=ON
> +LIBUHTTPD_CONF_OPTS += -DUSE_WOLFSSL=ON
> else ifeq ($(BR2_PACKAGE_MBEDTLS),y)
> LIBUHTTPD_DEPENDENCIES += mbedtls
> -LIBUHTTPD_CONF_OPTS += \
> - -DUHTTPD_SSL_SUPPORT=ON \
> - -DUHTTPD_USE_MBEDTLS=ON \
> - -DUHTTPD_USE_OPENSSL=OFF \
> - -DUHTTPD_USE_WOLFSSL=OFF
> +LIBUHTTPD_CONF_OPTS += -DUSE_MBEDTLS=ON
> else
> -LIBUHTTPD_CONF_OPTS += -DUHTTPD_SSL_SUPPORT=OFF
> +LIBUHTTPD_CONF_OPTS += -DSSL_SUPPORT=OFF
> endif
>
> -# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
> ifeq ($(BR2_SHARED_STATIC_LIBS),y)
> -LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
> -else ifeq ($(BR2_SHARED_LIBS),y)
> -LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
> +LIBUHTTPD_CONF_OPTS += -DBUILD_STATIC=ON
Here also we want the negative case to be explicit.
I made thosw changes, and also updated the commit message with an explanation
of them:
CMake options have been renamed: UHTTPD_ prefix was dropped,
BUILD_STATIC_LIBS renamed to BUILD_STATIC.
Also fix handling of BUILD_STATIC: it should only be given when building
static libs, otherwise no dynamic lib is built.
Applied to master, thanks.
Regards,
Arnout
> endif
>
> $(eval $(cmake-package))
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0
2021-05-18 6:17 [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0 Jianhui Zhao
@ 2021-05-18 11:22 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2021-05-18 11:22 UTC (permalink / raw)
To: buildroot
Jianhui, All,
On 2021-05-18 14:17 +0800, Jianhui Zhao spake thusly:
> Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
Applied to next, thanks.
Regards,
Yann E. MORIN.
> ---
> package/libuhttpd/libuhttpd.hash | 2 +-
> package/libuhttpd/libuhttpd.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash
> index 4b0b5027c6..19a02e5be0 100644
> --- a/package/libuhttpd/libuhttpd.hash
> +++ b/package/libuhttpd/libuhttpd.hash
> @@ -1,3 +1,3 @@
> # Locally calculated
> -sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz
> +sha256 dcd95fac7b29d43f57e942db6e9fb4c8745d4284684cd627d60c8a7f8c76cd32 libuhttpd-3.11.0.tar.gz
> sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
> diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk
> index 326c78face..61afec701e 100644
> --- a/package/libuhttpd/libuhttpd.mk
> +++ b/package/libuhttpd/libuhttpd.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -LIBUHTTPD_VERSION = 3.10.1
> +LIBUHTTPD_VERSION = 3.11.0
> LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
> LIBUHTTPD_LICENSE = MIT
> LIBUHTTPD_LICENSE_FILES = LICENSE
> --
> 2.25.1
>
> _______________________________________________
> 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] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0
@ 2021-05-18 6:17 Jianhui Zhao
2021-05-18 11:22 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Jianhui Zhao @ 2021-05-18 6:17 UTC (permalink / raw)
To: buildroot
Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
---
package/libuhttpd/libuhttpd.hash | 2 +-
package/libuhttpd/libuhttpd.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libuhttpd/libuhttpd.hash b/package/libuhttpd/libuhttpd.hash
index 4b0b5027c6..19a02e5be0 100644
--- a/package/libuhttpd/libuhttpd.hash
+++ b/package/libuhttpd/libuhttpd.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6e7a9ad61e3d0ab5bd4d20b274b850542dff8057a8fcf6c36ce59eb34818f61f libuhttpd-3.10.1.tar.gz
+sha256 dcd95fac7b29d43f57e942db6e9fb4c8745d4284684cd627d60c8a7f8c76cd32 libuhttpd-3.11.0.tar.gz
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
diff --git a/package/libuhttpd/libuhttpd.mk b/package/libuhttpd/libuhttpd.mk
index 326c78face..61afec701e 100644
--- a/package/libuhttpd/libuhttpd.mk
+++ b/package/libuhttpd/libuhttpd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIBUHTTPD_VERSION = 3.10.1
+LIBUHTTPD_VERSION = 3.11.0
LIBUHTTPD_SITE = https://github.com/zhaojh329/libuhttpd/releases/download/v$(LIBUHTTPD_VERSION)
LIBUHTTPD_LICENSE = MIT
LIBUHTTPD_LICENSE_FILES = LICENSE
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-20 13:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 2:42 [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0 Jianhui Zhao
2021-06-07 2:42 ` [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.12.1 Jianhui Zhao
2021-06-20 13:44 ` Arnout Vandecappelle
-- strict thread matches above, loose matches on Subject: below --
2021-05-18 6:17 [Buildroot] [PATCH 1/1] package/libuhttpd: bump version to 3.11.0 Jianhui Zhao
2021-05-18 11:22 ` 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.