Re: [Buildroot] [PATCH v2 1/1] package/pistache: bump version & switch to meson build

[Arnout Vandecappelle <arnout@mind.be>]

On 14/03/2022 19:13, Thomas Ruschival wrote:
> While upstream pistache has not yet released a stable 'tag'

  I don't think they ever will :-)

> a lot has changed since June 2020:
> 
> * project has moved to meson build system, cmake builds
>    do not install headers.
> * patches in buildroot are no longer required
> * project-implemented Pistache::Optional was replaced by
>    use of std::optional. This is only available in C++17
> * dependency to rapidjson has been introduced
> 
> Signed-off-by: Thomas Ruschival <thomas@ruschival.de>
> ---
>   ...-add-C-language-to-project-statement.patch | 70 --------------
>   ...eLists.txt-respect-BUILD_SHARED_LIBS.patch | 95 -------------------
>   ...de-pistache-typeid.h-include-cstddef.patch | 38 --------
>   package/pistache/Config.in                    |  9 +-
>   package/pistache/pistache.hash                |  2 +-
>   package/pistache/pistache.mk                  | 10 +-
>   6 files changed, 12 insertions(+), 212 deletions(-)
>   delete mode 100644 package/pistache/0001-CMakeLists.txt-add-C-language-to-project-statement.patch
>   delete mode 100644 package/pistache/0002-CMakeLists.txt-respect-BUILD_SHARED_LIBS.patch
>   delete mode 100644 package/pistache/0003-include-pistache-typeid.h-include-cstddef.patch
> 

[snip]
> diff --git a/package/pistache/pistache.mk b/package/pistache/pistache.mk
> index 4d6bd283ea..65d9b2412c 100644
> --- a/package/pistache/pistache.mk
> +++ b/package/pistache/pistache.mk
> @@ -4,18 +4,20 @@
>   #
>   ################################################################################
>   
> -PISTACHE_VERSION = f2f5a50fbfb5b8ef6cf1d3d2a9d442a8270e375d
> +PISTACHE_VERSION = 3ec9d7c4f8b828fdd391550fff81b01e72dd6269
>   PISTACHE_SITE = $(call github,oktal,pistache,$(PISTACHE_VERSION))
>   PISTACHE_LICENSE = Apache-2.0
>   PISTACHE_LICENSE_FILES = LICENSE
>   
>   PISTACHE_INSTALL_STAGING = YES
> +PISTACHE_DEPENDENCIES += rapidjson
>   
>   ifeq ($(BR2_PACKAGE_OPENSSL),y)
>   PISTACHE_DEPENDENCIES += openssl
> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=ON
> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=true
> +PISTACHE_CONF_OPTS += -DPISTACHE_ENABLE_NETWORK_TESTS=false

  I've applied to master as is, but this sounds like we would always want to 
disable it (we don't build tests if we can avoid it). Follow-up patch to move it 
out of the condition (if that's the right thing to do) welcome!

  Regards,
  Arnout

>   else
> -PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=OFF
> +PISTACHE_CONF_OPTS += -DPISTACHE_USE_SSL=false
>   endif
>   
> -$(eval $(cmake-package))
> +$(eval $(meson-package))
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot