Bug#885150: orbit2 FTCBFS: broken embedded copy of AC_CHECK_ALIGNOF
Source: orbit2
Version: 1:2.14.19-4
Tags: patch upstream
User: helmutg@debian.org
Usertags: rebootstrap
orbit2 fails to cross build from source, because its acinludes.m4
contains a broken and outdated embedded copy of AC_CHECK_ALIGNOF that
fails for cross compilation. It makes configure abort. After removing
the embedded copy (and thus using the upstream macro), configure
succeeds. The attached patch implements that.
The build still fails running src/idl-compiler/orbit-idl-2 with an Exec
format error. This secondary failure is not fixed in the attached patch.
Please close this bug anyway when fixing AC_CHECK_ALIGNOF.
Helmut
Index: orbit2-2.14.19/acinclude.m4
===================================================================
--- orbit2-2.14.19.orig/acinclude.m4
+++ orbit2-2.14.19/acinclude.m4
@@ -1,50 +1,3 @@
-#######################
-# type alignment test #
-#######################
-
-AC_DEFUN([AC_CHECK_ALIGNOF],
- [changequote(<<, >>)dnl
- dnl The name to #define.
- define(<<AC_TYPE_NAME>>,
- translit(orbit_alignof_$1, [a-z *], [A-Z_P]))dnl
- dnl The cache variable name.
- define(<<AC_CV_NAME>>,
- translit(ac_cv_alignof_$1, [ *], [_p]))dnl
- changequote([, ])dnl
- AC_MSG_CHECKING(alignment of $1)
- align_save_libs="$LIBS"
- LIBS="$ORBIT_LIBS $LIBS"
- AC_CACHE_VAL(AC_CV_NAME,
- [AC_TRY_RUN(
- [ #include <stdio.h>
- #include <stdlib.h>
-
- #include "$srcdir/include/orbit/util/basic_types.h"
- typedef struct {char s1;} CORBA_struct;
- typedef void *CORBA_pointer;
- struct test {char s1; $1 s2;};
- main()
- {
- FILE *f=fopen("conftestval", "w");
- if (!f) exit(1);
- fprintf(f, "%d\n", &(((struct test*)0)->s2));
- exit(0);
- } ],
- AC_CV_NAME=`cat conftestval`,
- AC_CV_NAME=0, AC_CV_NAME=0)
- ])dnl
- AC_MSG_RESULT($AC_CV_NAME)
- if test "$AC_CV_NAME" = "0" ; then
- AC_MSG_ERROR([Failed to find alignment. Check config.log for details.])
- fi
- LIBS="$align_save_libs"
- AC_TYPE_NAME=$AC_CV_NAME
- AC_SUBST(AC_TYPE_NAME)
- undefine([AC_TYPE_NAME])dnl
- undefine([AC_CV_NAME])dnl
-])
-
-
dnl @synopsis AX_CFLAGS_GCC_OPTION (optionflag [,[shellvar][,[A][,[NA]]])
dnl
dnl AX_CFLAGS_GCC_OPTION(-fvomit-frame) would show a message as like
Reply to: