mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 12:32:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #4399: configure.ac: introduce PERL_FOR_BUILD

Browse Source 
Most of mc uses of PERL is to embed path to the interpreter in VFS
helpers. There we can use path to perl for --host. But
`date-of-man-include.am` is the place where perl is used for --build.

On most systems both paths are expected to be /usr/bin/perl.
But on some systems paths might differ a bit. Most prominent
example is NixOS, where packages get installed into unique prefixes:

$ file /nix/store/...-perl-5.36.0/bin/perl \
       /nix/store/...-perl-powerpc64-unknown-linux-gnu-5.36.0/bin/perl
/nix/store/...-perl-5.36.0/bin/perl:
  ELF 64-bit LSB executable, x86-64, version 1 (SYSV), ...
/nix/store/...-perl-powerpc64-unknown-linux-gnu-5.36.0/bin/perl:
  ELF 64-bit MSB executable, 64-bit PowerPC or cisco 7500, ...

This allows running both binaries via qemu-user if needed for tests.

The change introduces PERL_FOR_BUILD (similar to autoconf's CC_FOR_BUILD
and friends) to allow passing both PERLs when needed.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Sergei Trofimovich 2022-08-18 10:40:20 +01:00 committed by Andrew Borodin
parent 08cca8aae8
commit 6b67d231a2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -347,11 +347,13 @@ dnl ############################################################################
case $host_os in case $host_os in
*os400) *os400)
AC_PATH_PROG([PERL], [perl], [/QOpenSys/pkgs/bin/perl]) AC_PATH_PROG([PERL], [perl], [/QOpenSys/pkgs/bin/perl])
AC_PATH_PROG([PERL_FOR_BUILD], [perl], [/QOpenSys/pkgs/bin/perl])
AC_PATH_PROG([PYTHON], [python], [/QOpenSys/pkgs/bin/python2]) AC_PATH_PROG([PYTHON], [python], [/QOpenSys/pkgs/bin/python2])
AC_PATH_PROG([RUBY], [ruby], [/QOpenSys/pkgs/bin/ruby]) AC_PATH_PROG([RUBY], [ruby], [/QOpenSys/pkgs/bin/ruby])
;; ;;
*) *)
AC_PATH_PROG([PERL], [perl], [/usr/bin/perl]) AC_PATH_PROG([PERL], [perl], [/usr/bin/perl])
AC_PATH_PROG([PERL_FOR_BUILD], [perl], [/usr/bin/perl])
AC_PATH_PROG([PYTHON], [python], [/usr/bin/python]) AC_PATH_PROG([PYTHON], [python], [/usr/bin/python])
AC_PATH_PROG([RUBY], [ruby], [/usr/bin/ruby]) AC_PATH_PROG([RUBY], [ruby], [/usr/bin/ruby])
esac esac

2
doc/man/date-of-man-include.am
View File

@ -6,7 +6,7 @@ SED_PARAMETERS = \
-e "s{%libexecdir%{@libexecdir@{g" -e "s{%libexecdir%{@libexecdir@{g"
MAN_DATE_CMD = \ MAN_DATE_CMD = \
LC_ALL=$(DATE_LANG) @PERL@ -CS -MPOSIX -e '\ LC_ALL=$(DATE_LANG) @PERL_FOR_BUILD@ -CS -MPOSIX -e '\
@fi=lstat("'$${MAN_FILE}'"); \ @fi=lstat("'$${MAN_FILE}'"); \
print POSIX::strftime("$(DATE_FORMAT)", localtime($$fi[9]));' 2>/dev/null print POSIX::strftime("$(DATE_FORMAT)", localtime($$fi[9]));' 2>/dev/null

2
src/man2hlp/man2hlp.in
View File

@ -1,4 +1,4 @@
#! @PERL@ -w #! @PERL_FOR_BUILD@ -w
# #
# Man page to help file converter # Man page to help file converter
# Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005, # Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,