0002-Remove-smartmatch-usage-from-gen-crypt-h.patch 2.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. From 95d6e03ae37f4ec948474d111105bbdd2938aba2 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
  3. Date: Sun, 25 Jun 2023 01:35:08 +0200
  4. Subject: [PATCH] Remove smartmatch usage from gen-crypt-h
  5. Needed for Perl 5.38
  6. Upstream: https://github.com/besser82/libxcrypt/commit/95d6e03ae37f4ec948474d111105bbdd2938aba2
  7. Signed-off-by: Daniel Lang <dalang@gmx.at>
  8. ---
  9. build-aux/scripts/gen-crypt-h | 31 ++++++++++++++-----------------
  10. 1 file changed, 14 insertions(+), 17 deletions(-)
  11. diff --git a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h
  12. index 12aecf6d..b113b791 100644
  13. --- a/build-aux/scripts/gen-crypt-h
  14. +++ b/build-aux/scripts/gen-crypt-h
  15. @@ -12,7 +12,6 @@ use v5.14; # implicit use strict, use feature ':5.14'
  16. use warnings FATAL => 'all';
  17. use utf8;
  18. use open qw(:std :utf8);
  19. -no if $] >= 5.018, warnings => 'experimental::smartmatch';
  20. no if $] >= 5.022, warnings => 'experimental::re_strict';
  21. use if $] >= 5.022, re => 'strict';
  22. @@ -37,22 +36,20 @@ sub process_config_h {
  23. local $_;
  24. while (<$fh>) {
  25. chomp;
  26. - # Yes, 'given $_' is really required here.
  27. - given ($_) {
  28. - when ('#define HAVE_SYS_CDEFS_H 1') {
  29. - $have_sys_cdefs_h = 1;
  30. - }
  31. - when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
  32. - $have_sys_cdefs_begin_end_decls = 1;
  33. - }
  34. - when ('#define HAVE_SYS_CDEFS_THROW 1') {
  35. - $have_sys_cdefs_throw = 1;
  36. - }
  37. - when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
  38. - $substs{XCRYPT_VERSION_STR} = $1;
  39. - $substs{XCRYPT_VERSION_MAJOR} = $2;
  40. - $substs{XCRYPT_VERSION_MINOR} = $3;
  41. - }
  42. +
  43. + if ($_ eq '#define HAVE_SYS_CDEFS_H 1') {
  44. + $have_sys_cdefs_h = 1;
  45. + }
  46. + elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') {
  47. + $have_sys_cdefs_begin_end_decls = 1;
  48. + }
  49. + elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') {
  50. + $have_sys_cdefs_throw = 1;
  51. + }
  52. + elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) {
  53. + $substs{XCRYPT_VERSION_STR} = $1;
  54. + $substs{XCRYPT_VERSION_MAJOR} = $2;
  55. + $substs{XCRYPT_VERSION_MINOR} = $3;
  56. }
  57. }