Re: [Buildroot] [next 1/2] package/poco: bump version to 1.12.2

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Julien Olivain <ju.o@free.fr>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [next 1/2] package/poco: bump version to 1.12.2
Date: Sun, 28 Aug 2022 12:18:03 +0200	[thread overview]
Message-ID: <20220828101803.GM37358@scaer> (raw)
In-Reply-To: <20220828084033.13660-1-ju.o@free.fr>

Julien, All,

On 2022-08-28 10:40 +0200, Julien Olivain spake thusly:
> poco 1.12.0 updated its pcre depencency to pcre2, see:
> https://github.com/pocoproject/poco/blob/poco-1.12.2-release/CHANGELOG#L37
> The Kconfig selection and dependencies are updated accordingly. This
> commit also reorder those Kconfig options alphabetically.
> 
> This commit adds an upstream patch to fix compilation failure with
> oracle-mysql. See:
> https://github.com/pocoproject/poco/commit/3884c734c261231c34f59e56cde7ae02945b4dae
> 
> This commit also adds "-latomic" to ldflags at configuration time, if
> the toolchain has it. This is required for some architecture: without
> this, compilation with bootlin-riscv64-glibc toolchain (for example)
> fails at link time with undefined reference to '__atomic_exchange_1'.
> The --ldflags option was introduced in 1.12.0 (Thanks Fabrice). See:
> https://github.com/pocoproject/poco/pull/3545
> 
> For the full Poco change log since 1.11.12, see:
> https://github.com/pocoproject/poco/blob/poco-1.12.2-release/CHANGELOG
> 
> Signed-off-by: Julien Olivain <ju.o@free.fr>
> ---
[--SNIP--]
> diff --git a/package/poco/poco.mk b/package/poco/poco.mk
> index c06e55210e..3bcc42c455 100644
> --- a/package/poco/poco.mk
> +++ b/package/poco/poco.mk
[--SNIP--]
> -POCO_DEPENDENCIES = pcre zlib \
> +POCO_DEPENDENCIES = pcre2 zlib \

I've pushed up a followup patch that reflows the dependencies one item
per line.

Applied to next, thanks.

Regards,
Yann E. MORIN.

>  	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
>  	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \
>  	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
> @@ -60,11 +60,17 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
>  POCO_MAKE_TARGET = all_release
>  endif
>  
> +POCO_LDFLAGS=$(TARGET_LDFLAGS)
> +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> +POCO_LDFLAGS += -latomic
> +endif
> +
>  define POCO_CONFIGURE_CMDS
>  	(cd $(@D); $(TARGET_MAKE_ENV) ./configure \
>  		--config=Linux \
>  		--prefix=/usr \
>  		--cflags=-std=c++14 \
> +		--ldflags="$(POCO_LDFLAGS)" \
>  		--omit="$(POCO_OMIT)" \
>  		$(POCO_CONF_OPTS) \
>  		--unbundled \
> -- 
> 2.37.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot