Re: [OE-core] [PATCH 01/27] libxcrypt-compat: upgrade 4.4.19 -> 4.4.20

From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH 01/27] libxcrypt-compat: upgrade 4.4.19 -> 4.4.20
Date: Mon, 17 May 2021 10:07:15 +0200	[thread overview]
Message-ID: <CANNYZj-EA8WJoysLgVwaXbg2GTAygXxQDjkA_k2vL5433NSt-Q@mail.gmail.com> (raw)
In-Reply-To: <20210516223247.2401235-1-richard.purdie@linuxfoundation.org>

[-- Attachment #1: Type: text/plain, Size: 3575 bytes --]

The main libxcrypt recipe was overlooked?

Alex

On Mon, 17 May 2021 at 00:33, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../libxcrypt/files/fix_cflags_handling.patch   | 17 +++++++++++++----
>  ...pat_4.4.19.bb => libxcrypt-compat_4.4.20.bb} |  0
>  meta/recipes-core/libxcrypt/libxcrypt.inc       |  2 +-
>  3 files changed, 14 insertions(+), 5 deletions(-)
>  rename meta/recipes-core/libxcrypt/{libxcrypt-compat_4.4.19.bb =>
> libxcrypt-compat_4.4.20.bb} (100%)
>
> diff --git a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> index 5448fe0fa69..0772998c722 100644
> --- a/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> +++ b/meta/recipes-core/libxcrypt/files/fix_cflags_handling.patch
> @@ -1,3 +1,8 @@
> +From fd9a46695594c3cd836ecb7d959f03f605e69a2f Mon Sep 17 00:00:00 2001
> +From: Richard Purdie <richard.purdie@linuxfoundation.org>
> +Date: Fri, 30 Apr 2021 10:35:02 +0100
> +Subject: [PATCH] libxcrypt: Update to 4.4.19 release and fix symbol
> version
> +
>  If you pass CFLAGS with a leading space, " " gets passed to popen and
> convinces
>  gcc to try and open a file called " ". This results in a confusing error
> message
>  like:
> @@ -9,8 +14,12 @@ Avoid this by stripping empty elements out of CFLAGS.
>  Upstream-Status: Submitted [
> https://github.com/besser82/libxcrypt/pull/126]
>  Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> -Index: a/build-aux/compute-symver-floor
> -===================================================================
> +---
> + build-aux/compute-symver-floor | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/build-aux/compute-symver-floor
> b/build-aux/compute-symver-floor
> +index 4ec82e1..8117342 100644
>  --- a/build-aux/compute-symver-floor
>  +++ b/build-aux/compute-symver-floor
>  @@ -36,6 +36,8 @@ sub preprocessor_check {
> @@ -20,5 +29,5 @@ Index: a/build-aux/compute-symver-floor
>  +        # Remove empty elements, particularly leading ones which cause
> issues with popen below
>  +        @CFLAGS = grep {$_} @CFLAGS;
>
> -         # We call ensure_C_locale here, not from the main section,
> -         # because this sub might not get called at all, in which
> +         # Remove empty elements, particularly leading ones which
> +         # cause issues with popen below.
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb
> b/meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb
> similarity index 100%
> rename from meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.19.bb
> rename to meta/recipes-core/libxcrypt/libxcrypt-compat_4.4.20.bb
> diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc
> b/meta/recipes-core/libxcrypt/libxcrypt.inc
> index 694e55546f0..c16068c1614 100644
> --- a/meta/recipes-core/libxcrypt/libxcrypt.inc
> +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc
> @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM =
> "file://LICENSING;md5=afed27a72ae2a8075978299eebaa1f5d \
>  inherit autotools pkgconfig
>
>  SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH}
> <http://github.com/besser82/libxcrypt.git;branch=$%7BSRCBRANCH%7D>"
> -SRCREV = "c79119414d7e30017d7b49566e7e4ea35112bdc8"
> +SRCREV = "e73ff0137de5152e69e8abb0bd260541804dfe5a"
>  SRCBRANCH ?= "develop"
>
>  SRC_URI += "file://fix_cflags_handling.patch"
> --
> 2.30.2
>
>
> 
>
>

[-- Attachment #2: Type: text/html, Size: 5147 bytes --]