mirror of
https://git.yoctoproject.org/poky
synced 2026-03-09 00:39:39 +01:00
2e4bdbc5c4
* 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
(From OE-Core rev: 54996f24243a10252d3aa70effc9c13db1d507f8)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From c3ec04f1aee68970b82e4b033bee1477e76798f9 Mon Sep 17 00:00:00 2001
|
|
From: Leon Timmermans <fawaka@gmail.com>
|
|
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 <Martin.Jansa@gmail.com>
|
|
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 = $_;
|
|
}
|