Source: flex
Version: 2.6.1-1
Tags: patch
User: [email protected]
Usertags: rebootstrap

Hi Manoj,

I see that you found time for working on flex again. Unfortunately the
upstream changes to 2.6.1 make it fail to cross build again. This time,
a stage1flex was added to produce the scanner built into flex itself. Of
course, we can't just run stage1flex during a cross build. I'm attaching
a patch that uses the system flex (required for help2man already)
instead.

With that patch and fixing flex to be M-A:foreign again and working
around #815172, I can successfully cross build flex again. Could you
apply this patch?

Also what's your progress on the flex/libfl-dev split MBF? I see that
you asked on d-devel for it and there were no objections. What's the
progress of it?

Helmut
--- flex-2.6.1/configure.ac
+++ flex-2.6.1/configure.ac
@@ -70,6 +70,7 @@
 FLEXexe='$(top_builddir)/src/flex$(EXEEXT)'
 fi
 AC_SUBST(FLEXexe)
+AM_CONDITIONAL([CROSS_COMPILING],[test "$cross_compiling" = yes])
 
 # Check for a m4 that supports -P
 
--- flex-2.6.1/debian/changelog
+++ flex-2.6.1/debian/changelog
@@ -1,3 +1,10 @@
+flex (2.6.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: (Closes: #-1)
+
+ -- Helmut Grohne <[email protected]>  Mon, 01 Aug 2016 13:28:35 +0200
+
 flex (2.6.1-1) unstable; urgency=low
 
   * New upstream version. The development of flex ias transitionaing to
+++ flex-2.6.1/src/Makefile.am
@@ -89,8 +89,13 @@
 stage1scan.l: scan.l
        cp $(srcdir)/scan.l $(srcdir)/stage1scan.l
 
+if CROSS_COMPILING
+stage1scan.c: stage1scan.l
+       $(FLEXexe) -o $@ $<
+else
 stage1scan.c: stage1scan.l stage1flex$(EXEEXT)
        $(top_builddir)/src/stage1flex$(EXEEXT) -o $@ $<
+endif
 
 # Explicitly describe dependencies.
 # You can recreate this with `gcc -I. -MM *.c'

Reply via email to