Source: bochs
Version: 2.8+dfsg-1
Tags: patch upstream
User: [email protected]
Usertags: ftcbfs

bochs regressed cross building in version 2.8+dfsg-1. Two distinct
problems have been introduced. One is the use of AC_RUN_IFELSE for
discovering readline. Running host code is not possible during cross
compilation. However, the relevant checks do not actually have a path
returning non-success. Therefore using AC_LINK_IFELSE should provide the
same results without running the program.

Later, detection of pulseaudio support is skipped when a cross build is
detected. Pulseaudio support is not incompatible with cross compilation
and the dh_install file actually requires the relevant plugin to be
installed. Dropping the cross compilation check fixes this.

I'm attaching a patch for your convenience. Please consider forwarding
it upstream in addition to applying it for Debian.

Helmut
Index: bochs-3.0+dfsg/configure.ac
===================================================================
--- bochs-3.0+dfsg.orig/configure.ac
+++ bochs-3.0+dfsg/configure.ac
@@ -991,7 +991,7 @@ if test "$want_readline" = yes; then
     AC_MSG_CHECKING(if readline works without -lcurses)
     OLD_LIBS=$LIBS
     LIBS="$LIBS -lreadline"
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
       #include <stdio.h>
       #include <readline/readline.h>
       int main() { rl_initialize(); return 0; }
@@ -1000,7 +1000,7 @@ if test "$want_readline" = yes; then
     ],[])
     AC_MSG_CHECKING(if readline works with -lcurses)
     LIBS="$LIBS -lcurses"
-    AC_RUN_IFELSE([AC_LANG_SOURCE([[
+    AC_LINK_IFELSE([AC_LANG_SOURCE([[
       #include <stdio.h>
       #include <readline/readline.h>
       int main() { rl_initialize(); return 0; }
@@ -2167,7 +2167,7 @@ if test "$soundcard_present" = 1; then
       AC_DEFINE(BX_HAVE_SDL2_AUDIO_CAPTURE, 1)
     fi
   fi
-  if test "$cross_configure" = 0 -a "$DEFAULT_GUI" != win32; then
+  if test "$DEFAULT_GUI" != win32; then
     if test "x$PKG_CONFIG" != x; then
       $PKG_CONFIG --exists libpulse-simple
       if test x$? = x0; then

Reply via email to