Source: libprelude
Version: 5.2.0-5.2
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
libprelude started failing to cross build again. This time around it is
caused by PAC/BTI as that's adding architecture specific compiler flags.
Confusion of compiler flags earlier was harmless and now causes a build
failure. I'm attaching a patch for your convenience.
Helmut
--- libprelude-5.2.0.orig/configure.ac
+++ libprelude-5.2.0/configure.ac
@@ -755,12 +755,18 @@
fi
+if test "$cross_compiling" = "yes"; then
+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-}"
+else
+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}"
+fi
dnl **************************************************
dnl * Setup build variable *
dnl **************************************************
AC_SUBST(CFLAGS)
+AC_SUBST(CFLAGS_FOR_BUILD)
AC_SUBST(PCFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
--- libprelude-5.2.0.orig/src/libprelude-error/Makefile.am
+++ libprelude-5.2.0/src/libprelude-error/Makefile.am
@@ -46,7 +46,7 @@
# It is correct to use $(CC_FOR_BUILD) here. We want to run the
# program at build time.
mkerrcodes: mkerrcodes.c mkerrcodes.h Makefile
- $(CC_FOR_BUILD) $(CFLAGS) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkerrcodes.c
code-from-errno.h: mkerrcodes Makefile
./mkerrcodes | LANG="" $(AWK) -f $(srcdir)/mkerrcodes2.awk >$@
