From 9fc30b5e72d781aa6bdd8e43194b6558fb3d9dd7 Mon Sep 17 00:00:00 2001
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 9 Nov 2021 13:46:36 +0100
Subject: [PATCH] libjpeg FTCBFS: fails to compute reasonable compiler
 identification from cross tools

libjpeg fails to cross build from source, because it attempts to include
a file e.g. Makefile_Settings.arm. The "arm" part here comes from an
attempt at extracting a compiler identification from the compiler
variable. The $ac_tool_prefix confuses the parsing code. It needs to be
stripped of. Please consider applying the attached patch to make libjpeg
cross buildable.
---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 725231b..1979ebf 100755
--- a/configure.in
+++ b/configure.in
@@ -69,13 +69,13 @@ AC_C_BIGENDIAN([AC_DEFINE(JPG_BIG_ENDIAN,[1],[Define to 1 for big endian])],[AC_
 # or a generic compiler
 if test "$ac_compiler_gnu" = "yes"; then
 # Define a couple of options concerning the compiler
-  ac_cccmd=`echo ${CC} | cut -f 1 -d ' ' | cut -f 1 -d '-'`
+  ac_cccmd=`echo ${CC} | cut -f 1 -d ' ' | sed "s/^$ac_tool_prefix//" | cut -f 1 -d '-'`
   if test "$ac_cccmd" = "icpc"; then
      ac_cccmd="icc"
   fi
   AC_SUBST(SETTINGS,${ac_cccmd})
 else
-  ac_cccmd=`echo ${CXX} | cut -f 1 -d ' '`
+  ac_cccmd=`echo ${CXX} | sed "s/^$ac_tool_prefix//" | cut -f 1 -d ' '`
   AC_SUBST(SETTINGS,${ac_cccmd})
 fi
 AC_SUBST(COMPILER,${CXX})