diff --git a/tools/automake/Makefile b/tools/automake/Makefile index 7f129c1d83..b698dd5a71 100644 --- a/tools/automake/Makefile +++ b/tools/automake/Makefile @@ -21,8 +21,7 @@ HOST_CONFIGURE_ARGS += \ --disable-silent-rules HOST_CONFIGURE_VARS += \ - PERL="/usr/bin/env perl" \ - am_cv_prog_PERL_ithreads=no + # temporary patch alternative for PERL="/usr/bin/env perl" define Host/Configure (cd $(HOST_BUILD_DIR); $(AM_TOOL_PATHS) STAGING_DIR_HOST="" ./bootstrap) diff --git a/tools/automake/patches/000-relocatable.patch b/tools/automake/patches/000-relocatable.patch index 0b61eaeb45..7d62435cb2 100644 --- a/tools/automake/patches/000-relocatable.patch +++ b/tools/automake/patches/000-relocatable.patch @@ -11,6 +11,12 @@ # We need at least this version for CLONE support. --- a/bin/aclocal.in +++ b/bin/aclocal.in +@@ -1,4 +1,4 @@ +-#!@PERL@ ++#!/usr/bin/env perl + # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- + # @configure_input@ + # Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -23,9 +23,11 @@ use 5.006; use strict; use warnings FATAL => 'all'; @@ -37,6 +43,12 @@ my $install = 0; --- a/bin/automake.in +++ b/bin/automake.in +@@ -1,4 +1,4 @@ +-#!@PERL@ ++#!/usr/bin/env perl + # automake - create Makefile.in from Makefile.am -*- perl -*- + # @configure_input@ + # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -26,9 +26,11 @@ use 5.006; use strict; use warnings FATAL => 'all';