| Andrew Geissler | 517393d | 2023-01-13 08:55:19 -0600 | [diff] [blame^] | 1 | From 4c3575346b9c7d394ebc73b4e5fabebadd8877ec Mon Sep 17 00:00:00 2001 |
| 2 | From: Chris Liddell <chris.liddell@artifex.com> |
| 3 | Date: Thu, 24 Nov 2022 16:33:47 +0000 |
| 4 | Subject: [PATCH] Fix a little bitrot in the cross-compiling logic |
| 5 | |
| 6 | Removing the option to disable FAPI meant configuring for cross compiling would |
| 7 | fail because the option being passed to the sub-call to configure would include |
| 8 | an unknown command line option. |
| 9 | |
| 10 | Upstream-Status: Backport [https://git.ghostscript.com/?p=ghostpdl.git;a=patch;f=configure.ac;h=4c3575346b9c7d394ebc73b4e5fabebadd8877ec] |
| 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
| 12 | --- |
| 13 | configure.ac | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| 16 | diff --git a/configure.ac b/configure.ac |
| 17 | index d5c68c4b3..738eb10a9 100644 |
| 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
| 20 | @@ -138,7 +138,7 @@ if test x"$host" != x"$build" ; then |
| 21 | echo $AUXFLAGS_MAK_LINE07 >> $AUXFLAGS_MAK.in |
| 22 | |
| 23 | AC_MSG_NOTICE([Begin recursive call to configure script (for auxiliary tools)]) |
| 24 | - "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-fapi --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" |
| 25 | + "$absolute_source_path/configure" CC="$CCAUX" CFLAGS="$CFLAGSAUX" CPPFLAGS="$CPPFLAGSAUX" LDFLAGS="$LDFLAGSAUX" CCAUX= CFLAGSAUX= CFLAGSAUX= MAKEFILE=$AUXFLAGS_MAK --host=$build --build=$build --enable-auxtools_only --disable-hidden-visibility --with-local-zlib --without-libtiff --disable-contrib --disable-fontconfig --disable-dbus --disable-freetype --disable-cups --disable-openjpeg --disable-gtk --with-libiconv=no --without-libidn --without-libpaper --without-pdftoraster --without-ijs --without-jbig2dec --without-x --with-drivers="" |
| 26 | status=$? |
| 27 | cp config.log "$olddir/configaux.log" |
| 28 | if test $status -eq 0 ; then |
| 29 | @@ -2530,7 +2530,7 @@ PDF= |
| 30 | PDF_MAK="\$(GLSRCDIR)\$(D)stub.mak" |
| 31 | PDFROMFS_MAK="\$(GLSRCDIR)\$(D)stub.mak" |
| 32 | |
| 33 | -if test x"$with_pdf" != x"no" ; then |
| 34 | +if test x"$with_pdf" != x"no" -a x"$enable_auxtools_only" != x"yes" ; then |
| 35 | |
| 36 | if test x"$JBIG2_DECODER" = x""; then |
| 37 | AC_MSG_ERROR([No JBIG2 decoder available, required for PDF support]) |
| 38 | -- |
| 39 | 2.25.1 |
| 40 | |