From patchwork Wed Jul 26 13:13:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jansa X-Patchwork-Id: 27945 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46DF9C001DC for ; Wed, 26 Jul 2023 13:13:50 +0000 (UTC) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by mx.groups.io with SMTP id smtpd.web11.10662.1690377226129381287 for ; Wed, 26 Jul 2023 06:13:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20221208 header.b=bVtDs1Fi; spf=pass (domain: gmail.com, ip: 209.85.208.44, mailfrom: martin.jansa@gmail.com) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-51ff0e3d8c1so9614111a12.0 for ; Wed, 26 Jul 2023 06:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690377224; x=1690982024; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=bTTmEOvj2sC4GI/rBoI5w/oKxssBB+JPNGv9ghDoywc=; b=bVtDs1FiE38asSpXExadopWm9mv3AQdMF9pR2mz3eG6KaEI+7iZ5HYlhEtZ2POi780 I9YKIWWtjcCDjLY80o9081LokvdnUkyXZ8IhNkZNovqX/mDwGeqKER6pt2IGJTp5ZtlW l4OYM+Ls0/GrbvBnislLjAmYxF39ASVfPYQVQVwMPIAsjQqCSVkdJxlk9Z4zMT8OtxWL zun7Xp68ap/qFKyB48X20Mk+k8qS/wP1AVS24HikYwO51a6hvVgnSHJ5FU5CTYNgu4dY hylir09RqR9Cyvx99oBRRlG8Xvj/7AsnKJZklIARSc4F8gpMfnPXQVk8yeVcjNcfx6k/ ekrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690377224; x=1690982024; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bTTmEOvj2sC4GI/rBoI5w/oKxssBB+JPNGv9ghDoywc=; b=BnxUiv5boFOw9hEAEYYDjm7bHETq5zF1K/MKJt7wjhUntGRqu9Vj9NpLzZZUrTjKvL k3tAQm2I81ujkT1jYoPHa56avl6vT7jctVzw6g+3/wYyYuaXFJRlCo5RSn7qfB4VXnjw /wgWoYs2sxjeXfWRfSblYqZ5JvSkI+wHivw0nzkzIY7Dpu8UAIYkGoPmd7jUMuiACghf aS6I9+NUBFJ5Janw2RbjtwSc7PQUXvueTkzIhNjRnUtx26SNRPfLexss0gBqSNjUGkfM vBGdeUqHxWEgf8Z+Hc0T9JzlSD5lZga+6yU3RLDyOdv4Edl24+dpwZ62xTYzpyaBwJT9 KY2w== X-Gm-Message-State: ABy/qLYre4QqoTZjGWrDMF6xWXTxYpVfixKi1i3Rd+Rh0qyjxQKG9TTs U9p7whyJNuaIGQBcGRjfmGe2xCdZZ2o= X-Google-Smtp-Source: APBJJlHapNch5Qznav47OCWDwmK3TWtA0SH6eFwUvCEipV9lkmyB0KhPSKNLp5AZTf3wBhC6PEZTVg== X-Received: by 2002:a17:906:18:b0:992:a9ba:b8da with SMTP id 24-20020a170906001800b00992a9bab8damr1637654eja.70.1690377224061; Wed, 26 Jul 2023 06:13:44 -0700 (PDT) Received: from localhost (ip-109-238-218-228.aim-net.cz. [109.238.218.228]) by smtp.gmail.com with ESMTPSA id jj27-20020a170907985b00b0099b7276235esm7678964ejc.93.2023.07.26.06.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Jul 2023 06:13:43 -0700 (PDT) From: Martin Jansa X-Google-Original-From: Martin Jansa To: openembedded-core@lists.openembedded.org Cc: steve@sakoman.com, Martin Jansa Subject: [kirkstone][PATCH] libxcrypt: fix build with perl-5.38 and use master branch Date: Wed, 26 Jul 2023 15:13:31 +0200 Message-ID: <20230726131331.2239727-1-Martin.Jansa@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 26 Jul 2023 13:13:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184884 * fixes do_configure failure: checking whether all ucontext.h functions are available... yes when is deprecated at libxcrypt/4.4.30-r0/git/build-aux/scripts/BuildCommon.pm line 522. Compilation failed in require at ../git/build-aux/scripts/expand-selected-hashes line 28. BEGIN failed--compilation aborted at ../git/build-aux/scripts/expand-selected-hashes line 28. configure: error: bad value 'all' for --enable-hashes NOTE: The following config.log files may provide further information. * with this patch backported it works OK: libxcrypt/4.4.30-r0/git $ perl build-aux/scripts/expand-selected-hashes usage: expand-selected-hashes hashes.conf names,of,selected,hashes * similarly do_compile failure: ../git/build-aux/scripts/move-if-change crypt-hashes.h.T crypt-hashes.h ../git/build-aux/scripts/move-if-change crypt-symbol-vers.h.T crypt-symbol-vers.h given is deprecated at ../git/build-aux/scripts/gen-crypt-h line 41. Makefile:3818: Makefile.deps: No such file or directory make: *** [Makefile:3715: crypt.h.stamp] Error 255 * also use master branch instead of develop, the SRCREV exists in both but stable metadata branches should track stable component branches libxcrypt/4.4.30-r0/git $ git branch -a --contains d7fe1ac04c326dba7e0440868889d1dccb41a175 | tee * develop remotes/origin/HEAD -> origin/develop remotes/origin/develop remotes/origin/master and oe-core master also uses master SRCBRANCH since: https://git.openembedded.org/openembedded-core/commit/?id=d18e89bd2b46c6e266cc39dbe9fdb6c032f5f1fe Signed-off-by: Martin Jansa --- ...ommon.pm-compatible-with-latest-perl.patch | 50 +++++++++++++++ ...ve-smartmatch-usage-from-gen-crypt-h.patch | 62 +++++++++++++++++++ meta/recipes-core/libxcrypt/libxcrypt.inc | 7 ++- 3 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch create mode 100644 meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch diff --git a/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch b/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch new file mode 100644 index 0000000000..b3e43d5815 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch @@ -0,0 +1,50 @@ +From c3ec04f1aee68970b82e4b033bee1477e76798f9 Mon Sep 17 00:00:00 2001 +From: Leon Timmermans +Date: Tue, 6 Jun 2023 17:03:57 +0200 +Subject: [PATCH] Make BuildCommon.pm compatible with latest perl + +It was previously using an experimental feature that has since been dropped. +This removes the use of that feature. + +Signed-off-by: Martin Jansa +Upstream-Status: Backport [v4.4.35 https://github.com/besser82/libxcrypt/commit/ce562f4d33dc090fcd8f6ea1af3ba32cdc2b3c9c] +--- + build-aux/scripts/BuildCommon.pm | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm +index 0e6f2a3..c38ba21 100644 +--- a/build-aux/scripts/BuildCommon.pm ++++ b/build-aux/scripts/BuildCommon.pm +@@ -11,7 +11,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -519,19 +518,19 @@ sub parse_symver_args { + my $COMPAT_ABI; + local $_; + for (@args) { +- when (/^SYMVER_MIN=(.+)$/) { ++ if (/^SYMVER_MIN=(.+)$/) { + $usage_error->() if defined $SYMVER_MIN; + $SYMVER_MIN = $1; + } +- when (/^SYMVER_FLOOR=(.+)$/) { ++ elsif (/^SYMVER_FLOOR=(.+)$/) { + $usage_error->() if defined $SYMVER_FLOOR; + $SYMVER_FLOOR = $1; + } +- when (/^COMPAT_ABI=(.+)$/) { ++ elsif (/^COMPAT_ABI=(.+)$/) { + $usage_error->() if defined $COMPAT_ABI; + $COMPAT_ABI = $1; + } +- default { ++ else { + $usage_error->() if defined $map_in; + $map_in = $_; + } diff --git a/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch b/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch new file mode 100644 index 0000000000..603f52f792 --- /dev/null +++ b/meta/recipes-core/libxcrypt/files/0002-Remove-smartmatch-usage-from-gen-crypt-h.patch @@ -0,0 +1,62 @@ +From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= +Date: Sun, 25 Jun 2023 01:35:08 +0200 +Subject: [PATCH] Remove smartmatch usage from gen-crypt-h + +Needed for Perl 5.38 + +Signed-off-by: Martin Jansa +Upstream-Status: Backport [v4.4.36 https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2] +--- + build-aux/scripts/gen-crypt-h | 31 ++++++++++++++----------------- + 1 file changed, 14 insertions(+), 17 deletions(-) + +diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h +index 12aecf6..b113b79 100644 +--- a/build-aux/scripts/gen-crypt-h ++++ b/build-aux/scripts/gen-crypt-h +@@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14' + use warnings FATAL => 'all'; + use utf8; + use open qw(:std :utf8); +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + no if $] >= 5.022, warnings => 'experimental::re_strict'; + use if $] >= 5.022, re => 'strict'; + +@@ -37,22 +36,20 @@ sub process_config_h { + local $_; + while (<$fh>) { + chomp; +- # Yes, 'given $_' is really required here. +- given ($_) { +- when ('#define HAVE_SYS_CDEFS_H 1') { +- $have_sys_cdefs_h = 1; +- } +- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { +- $have_sys_cdefs_begin_end_decls = 1; +- } +- when ('#define HAVE_SYS_CDEFS_THROW 1') { +- $have_sys_cdefs_throw = 1; +- } +- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { +- $substs{XCRYPT_VERSION_STR} = $1; +- $substs{XCRYPT_VERSION_MAJOR} = $2; +- $substs{XCRYPT_VERSION_MINOR} = $3; +- } ++ ++ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { ++ $have_sys_cdefs_h = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { ++ $have_sys_cdefs_begin_end_decls = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { ++ $have_sys_cdefs_throw = 1; ++ } ++ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { ++ $substs{XCRYPT_VERSION_STR} = $1; ++ $substs{XCRYPT_VERSION_MAJOR} = $2; ++ $substs{XCRYPT_VERSION_MINOR} = $3; + } + } + diff --git a/meta/recipes-core/libxcrypt/libxcrypt.inc b/meta/recipes-core/libxcrypt/libxcrypt.inc index 454a55d73d..342cbd0d06 100644 --- a/meta/recipes-core/libxcrypt/libxcrypt.inc +++ b/meta/recipes-core/libxcrypt/libxcrypt.inc @@ -11,9 +11,12 @@ inherit autotools pkgconfig SRC_URI = "git://github.com/besser82/libxcrypt.git;branch=${SRCBRANCH};protocol=https" SRCREV = "d7fe1ac04c326dba7e0440868889d1dccb41a175" -SRCBRANCH ?= "develop" +SRCBRANCH ?= "master" -SRC_URI += "file://fix_cflags_handling.patch" +SRC_URI += "file://fix_cflags_handling.patch \ + file://0001-Make-BuildCommon.pm-compatible-with-latest-perl.patch \ + file://0002-Remove-smartmatch-usage-from-gen-crypt-h.patch \ +" PROVIDES = "virtual/crypt"