Skip to content

Commit b69b124

Browse files
committed
Actually patch configure.
1 parent cf6e806 commit b69b124

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

src/libxcrypt/force_perl_510.patch

+25-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
1-
diff --git a/configure.ac b/configure.ac
2-
index b9394d87..8b8748b6 100644
3-
--- a/configure.ac
4-
+++ b/configure.ac
5-
@@ -46,7 +46,7 @@ esac
6-
AC_PROG_CPP
7-
AC_PROG_MAKE_SET
8-
AC_PROG_LN_S
9-
-zw_PROG_PERL([5.14.0])
10-
+zw_PROG_PERL([5.10.0])
11-
AC_PATH_PROG([GPG2], [gpg2], [false])
12-
AC_PATH_PROG([SHA256SUM], [sha256sum], [false])
1+
diff --git a/configure b/configure
2+
index 5074c031..a99e7ce9 100755
3+
--- a/configure
4+
+++ b/configure
5+
@@ -4808,16 +4808,16 @@ $as_echo "no" >&6; }
6+
fi
137

8+
9+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PERL is version 5.14.0 or later" >&5
10+
-$as_echo_n "checking whether $PERL is version 5.14.0 or later... " >&6; }
11+
-$as_echo "$as_me:${as_lineno-$LINENO}: $PERL -e 'use v5.14.0;'" >&5
12+
-if "$PERL" -e 'use v5.14.0;' >&5 2>&1; then :
13+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PERL is version 5.10.0 or later" >&5
14+
+$as_echo_n "checking whether $PERL is version 5.10.0 or later... " >&6; }
15+
+$as_echo "$as_me:${as_lineno-$LINENO}: $PERL -e 'use v5.10.0;'" >&5
16+
+if "$PERL" -e 'use v5.10.0;' >&5 2>&1; then :
17+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
18+
$as_echo "yes" >&6; }
19+
else
20+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
21+
$as_echo "no" >&6; }
22+
-as_fn_error $? "Perl version 5.14.0 or later is required" "$LINENO" 5
23+
+as_fn_error $? "Perl version 5.10.0 or later is required" "$LINENO" 5
24+
fi
25+
# Extract the first word of "gpg2", so it can be a program name with args.
26+
set dummy gpg2; ac_word=$2

0 commit comments

Comments
 (0)