flex: Update to version 2.6.15

Message ID 20261116161155.3158983-1-adolf.belka@ipfire.org
State New
Headers
Series flex: Update to version 2.6.15 |

Commit Message

Adolf Belka 16 Nov 2026, 4:11 p.m. UTC
- This supercedes the previous patch submission made for an update to 2.6.13
- Update from version 2.6.4 to 2.6.15
- Update of rootfile
- The patch is no longer needed as it is no included into the tarball.
- Changelog
2.6.15
scanner
    A program can define YY_BREAK again, as it could with flex 2.6.4.
     YY_BREAK is the code that ends each rule's action, and a program can
     define it, for example to leave out the break and avoid warnings
     about unreachable code. Flex 2.6.5 and later no longer used it, so
     such a definition was ignored without any message. The default back
     end uses it again. The post-action option still replaces it.
    A program can declare yyinput() itself again, as it could with
     flex 2.6.4. Flex 2.6.5 named the function that reads the next
     character in a C scanner yyinput(), so a declaration such as
     "extern int yyinput(void);" in a program's own header no longer
     compiled, which stopped VirtualBox from building. The function is
     called input() in a C scanner again, as in 2.6.4. In a rule's
     action, yyinput() is still accepted and works as input(); anywhere
     else in a C scanner, use input(). A C scanner that is compiled as
     C++ keeps the name yyinput(), as in 2.6.4, and a C++ scanner is
     unchanged. (#863)
    Flex no longer writes past the end of a buffer on its stack when a
     rule's action in a c99 or go scanner has a call to yypanic() or a
     similar function that is as long as the C library's BUFSIZ or
     longer (8192 bytes with glibc). Before, flex wrote the scanner
     without the end of the call, so the C did not compile. (#864)
2.6.14
scanner
    After yyless() gives text back, the scanner now works out whether it is
     at the start of a line from the text that is left. When the text kept
     ends in a newline, a rule that starts with ^ can match what follows.
     With yyless(0), the scanner is back at the line state it had before
     the match. Before, the scanner kept the line state of the whole token,
     and such a rule did not match. (#452)
    yyinput() no longer overwrites the characters it reads with NUL
     bytes. A program that gave the scanner its own buffer with
     yy_scan_buffer() found those characters gone from its buffer
     afterwards. As a string, yytext now extends over the characters
     that yyinput() has read, and yyleng, the length of the token, is
     unchanged. (#396, #395)
2.6.13
scanner
    A scanner built with %array no longer reads or writes before the
     start of its input buffer when yymore() is used after the scanner
     switches buffers, after unput() has pushed text back to the start
     of the buffer, or after the program has lengthened yytext. Since
     flex 2.6.5 the scanner could point yytext before the buffer, and the
     next refill or yyless() then went outside it. The text saved by
     yymore() now ends at the start of the buffer. (#809)
    A scanner with a very large set of rules is built correctly again.
     Since flex 2.6.5, some of its tables could be given an element type
     too small for the numbers stored in them. A C++ compiler rejected
     the generated file with "narrowing conversion" errors. A C compiler
     only warned, and in our test the scanner then looped forever.
     Doxygen's code scanner is one example. Flex now chooses the types
     as 2.6.4 did, and for a table of offsets or indexes by the largest
     value it can hold. Two other tables of such a scanner are also half
     the size they had become. (#816)
    A scanner that loads its tables from a file works again on 32-bit
     systems. Since flex 2.6.5 the loader took a table of indexes for a
     table of integers where a pointer is four bytes wide, and refused
     the file with "table id not found in map". The tests for tables
     files failed on i686 and on 32-bit ARM. (#838)
2.6.12
scanner
    A program can declare yyunput() itself again, as it could with
     flex 2.6.4. Flex 2.6.5 made yyunput a one-argument macro, so a
     declaration such as "static void yyunput (int c, char *buf_ptr);",
     which some programs write to silence an unused-function warning,
     no longer compiled. The scanner's function is called yyunput again,
     with the arguments it had in 2.6.4, and in a C++ scanner it is the
     yyFlexLexer member of that name again. The macro is gone from the
     default back end. In a rule's action, yyunput(c) is still accepted
     and works as unput(c); anywhere else, use unput(c). (#858)
    A program can have its own functions named yybegin, yyecho,
     yystart, yyatbol or yysetbol, as GCC does with yybegin, and they
     compile again. Flex 2.6.5 defined these names as macros, which
     rewrote the program's declarations and definitions. The default
     back end no longer defines them. Inside a rule's action flex still
     accepts them and writes the old interface in their place: BEGIN,
     ECHO, YY_START, YY_AT_BOL() and yy_set_bol(). Outside an action,
     use the old interface. (#856)
    A C++ scanner built with %option nodefault compiles again. Flex
     2.6.5 and later generated a call to yypanic(), which a C++ scanner
     does not have, for input that no rule matches. It now goes through
     YY_FATAL_ERROR, and so to LexerError(), as in 2.6.4. (#858)
    A program can call yy_fatal_error(), the 2.6.4 name of yypanic(),
     again. YY_BUF_SIZE and YY_READ_BUF_SIZE are defined before the
     scanner's first section again, so the program can use them there.
     (#858)
    A non-reentrant C scanner whose rules never need backing up no
     longer declares the two unused variables yy_last_accepting_state
     and yy_last_accepting_cpos. Flex 2.6.5 and later declared them
     anyway, so building such a scanner, for example one made with
     %option full, stopped a program that compiles with -Werror, such
     as the Kconfig lexer in the Xen hypervisor. (#859)
test
    "make check" now tests only the build of flex. The tests of the
     maintainer scripts in tools/ were part of it, and three of them
     build small git repositories, so a build from a tarball failed
     where git was not installed. They now run with "make check-tools".
     (#857)
2.6.11
scanner
    A C++ scanner now frees every buffer left on its buffer stack when
     it is destroyed. Before, it freed only the top one, so each buffer
     added with yypush_buffer_state() and not yet removed leaked its
     memory. The C scanners already did this in yylex_destroy().
test
    The scan_length tests could fail on some architectures, such as
     aarch64, because two variables in each test could hold wrong values
     after the test recovered from the expected fatal error. They are
     now declared so that the compiler cannot do that. (#850)
2.6.10
scanner
    A generated scanner compiles again where the C library's <stdio.h>
     does not define BUFSIZ, as in a freestanding build such as GRUB's.
     Flex 2.6.5 and later sized each read with BUFSIZ, so the scanner
     failed to compile there. It now uses BUFSIZ when it is defined and
     8192 when it is not, in both the default and the c99 back end. In
     the default back end, a definition of YY_READ_BUF_SIZE still takes
     precedence over both. (#851)
2.6.9
scanner
    Four names that programs used with flex 2.6.4, and that flex 2.6.5
     changed, work again. The global debug flag is again called
     yy_flex_debug (with a prefix, the prefix followed by _flex_debug),
     so a program that declares it with its own extern declaration links
     again; in a C++ scanner it is again the yy_flex_debug member of
     yyFlexLexer. The buffer structure's member that records whether the
     scanner is at the beginning of a line is again called yy_at_bol. A
     definition of YY_READ_BUF_SIZE in the scanner file is used again.
     Defining FLEXINT_H again keeps the scanner from declaring its own
     integer types, for a program that supplies them. The new names
     yyflexdebug and yyatbol() continue to work.
    A generated scanner compiles again in a program that declares
     YY_BUFFER_STATE itself, guarded by YY_TYPEDEF_YY_BUFFER_STATE, as it
     did with flex 2.6.4. Flex 2.6.5 declared its new yybuffer type under
     that same guard, so such a program got no yybuffer and the scanner
     failed to compile. The two types now have separate guards. (#848)
2.6.8
build
    Flex now builds when configured with --disable-nls. It failed to
     compile with a compiler that treats a call to an undeclared function
     as an error, because the report of backing-up states used a function
     that is only declared when translations are enabled. (#844)
2.6.7
scanner
    A generated scanner now compiles when the program is built in a
     strict ISO C mode, such as -std=c99, with a compiler that treats a
     call to an undeclared function as an error (GCC 14 and later, Clang
     16 and later). Those modes hide a function the scanner needs to tell
     whether its input is a terminal, and the scanner now declares it
     itself. This also fixes "make check" failing in flex 2.6.6 with
     those compilers. (#845)
2.6.6
build
    tools/bootstrap-flex now builds flex 2.6.5 and checks its signature
     against the flex release key, as well as its hash. It needs gpg.
scanner
    A generated scanner no longer fails to compile in a program that
     defines a macro named fallthrough, as the Linux kernel's headers do.
     Flex 2.6.5 wrote the fall-through marker with that plain name, so
     the macro was expanded inside the scanner. The scanner now uses the
     reserved spelling fallthrough for the attribute. (#842)
2.6.5
build
    The ChangeLog that tools/git2cl writes is now valid UTF-8. Author
     names with accented characters used to come out in a different
     encoding from the rest of the file, and the script printed "Wide
     character in print" warnings.
    The ChangeLog in the nightly distribution tarballs is no longer
     empty, and the nightly build now fails if it would be.
    The script that updates the translations from the Translation
     Project now converts any .po file that is not in UTF-8 to UTF-8, so
     every translation in the source tree uses the same encoding.
    The version and date in the header of each release's section of this
     NEWS file, and the version in configure.ac, are now set together by
     a script when the release is made. A release candidate gets its own
     header in the same way.
    Regenerating the build files now needs gettext 0.23 or later. The
     po/ directory can then be built in parallel with make -j. Building
     from a release tarball is not affected.
    A new script, tools/bootstrap-flex, builds and installs the previous
     release of flex. Building flex from a git checkout needs a flex that
     is already installed, and the script lets a system without one get
     started.
    Building flex no longer rewrites the .po translation files.
    A race condition that could build flex twice at the same time during
     a parallel make has been fixed.
    Releases are now made and signed by a GitHub workflow. Each release
     has a detached signature for the tarballs and for a SHA256SUMS file,
     and a copy of the public key. The key is new and is not connected to
     the key that signed 2.6.4. The new key's fingerprint is 56D6 64C7
     0CC2 364C F516 4914 B7DF E8BB 6C24 1FED. It is published on
     keys.openpgp.org, at flexlexer.org, and in the README.
    Source files now carry SPDX license identifiers.
    The replacement malloc in lib/ now has a full prototype.
    Automated builds now run on GitHub Actions instead of travis-ci, and
     nightly distribution tarballs are built there.
    The configure script accepts the space that AC_PROG_LEX puts before
     the parentheses when checking for yymore and yyreject. It also no
     longer uses obsolete Autoconf macros, and the macro that finds the C
     compiler for the build machine has been updated to fix problems with
     executable file names when cross compiling.
    The man page can now be built when cross compiling, including on
     MS Windows. (#560)
    Various edge cases, mostly involving out-of-tree builds have been
     accounted for in the autotools build system.
    The build now has flex build its own scanner a second time and fails
     if the result differs from the first. This check runs only for
     native builds.
    The GitHub Actions workflows now use pinned versions of the actions,
     have read-only permissions, and are kept up to date by dependabot.
    The minimum versions of the Autotools needed to build flex are now
     correct and documented, and autogen.sh is more reliable in finding
     libtoolize.
    Flex no longer searches PATH for m4 itself and leaves that to the
     system. This avoids a failure on 32-bit systems that read file
     systems with 64-bit inode numbers. (#413)
    Flex no longer declares reallocarray() itself.
    Flex now includes its own <config.h> header before including system
     headers so that any system specific features detected by configure
     are taken into account during compilation of flex itself.
    The flex build system now includes Makefile targets at the top level
     to allow just building and installing libfl.
    The flex distribution now includes a file, src/libfl.pc, to allow
     using pkgconfig to find out what flags to use when building against
     libfl from flex.
    The skeleton files are now generated correctly on systems whose
     files use CRLF line endings.
    A crash during building on NetBSD has been fixed.
documentation
    Several examples in the manual have been corrected or modernized:
     character classes, case-insensitive ranges, the patterns for C and
     C++ comments, the Bison snippets, and a call to yylex_init_extra().
    Thanks to Joseph Langley, Martin Joerg, zmajeed, Akim Demaille and
     Nikolaos Chatzikonstantinou.
    Typos in the manual and the README have been fixed.
    INSTALL is now INSTALL.md and has updated instructions. There is a
     new CONTRIBUTING.md, and the README now describes how to use the
     mailing list and where to find releases.
    New bg, ka, lv, pt, uk translations from the Translation Project.
    Updated ca, da, de, eo, es, fi, fr, ga, hr, ko, nl, pl, pt_BR, ro,
     ru, sr, sv, tr, vi, zh_CN, zh_TW translations from the Translation
     Project.
    Added machine translations of the ca, da, de, eo, es, fi, ga, hr,
     ka, ko, pt_BR, ru, sr, tr, vi, zh_CN messages that the Translation
     Project had not updated. A native speaker has not reviewed them, and
     each one is marked as machine translated in its .po file.
     Translations from the Translation Project will replace them.
    The --yymore option is now documented.
    The manual now describes how to retarget flex to other languages and
     lists the deprecated interfaces and their replacements.
    The flex manual is now on the web at
     https://westes.github.io/flex/manual/, split into one page per
     section, and as a single page at
     https://westes.github.io/flex/manual-single.html. General
     information about flex is at https://westes.github.io/flex/. The
     site is rebuilt from the flex sources for each release.
scanner
    A generated scanner now marks the places where it falls through from
     one case to the next with the fall-through attribute, where the
     compiler supports it, instead of only a comment. Clang, which
     ignores the comment, no longer warns about them under
     -Wimplicit-fallthrough. This covers the end-of-file cases for start
     conditions without an <<EOF>> rule and the fall-through in
     yyinput(). (#427, #709)
    A scanner that defines YY_NO_INPUT or YY_NO_UNPUT in section 1 again
     has yyinput() or yyunput() left out, as in flex 2.6.4, and no longer
     gets warnings about unused functions. The new names YY_NO_YYINPUT
     and YY_NO_YYUNPUT work as well. (#804)
    A scanner that defines its own ECHO macro again has it used, both
     by ECHO actions and by the default rule, as in flex 2.6.4, and no
     longer gets a warning that ECHO is redefined. Defining yyecho()
     takes precedence over defining ECHO. (#803)
    A scanner that defines its own YY_INPUT or yyread() can again create
     a buffer from a NULL file, for example with yy_create_buffer(NULL,
     size), and have it filled through that routine, as in flex 2.6.4.
     Such a buffer is treated as empty only when the scanner reads its
     input with flex's own routine, which needs a file to read from.
     (#802)
    The header file written by the --header-file option no longer
     contains the code from section 3 of the scanner file, such as
     function definitions. A scanner whose header was included in other
     source files could fail to compile or link because of it. (#801)
    yy_scan_string() and yy_scan_bytes() no longer write outside the
     buffer they allocate when the input is too long for an int, or when
     the length given to yy_scan_bytes() is negative. They now stop with
     the fatal error "string too long for yy_scan_string()" or "negative
     length in yy_scan_bytes()". Input longer than an int can hold was
     never supported; before, it could corrupt the heap. (#446, #664)
    A scanner file could run commands while flex was running by
     putting m4 macros in the values of options such as outfile,
     header-file, yydecl, user-init, pre-action and post-action. Flex
     now passes those values through as plain text, and rejects the
     characters '[' and ']' in them, in the output and header file
     names, in the class name given to yyclass, and in the prefix.
     (#728)
    The --skel (-S) option again makes flex read the skeleton file it
     names. Flex had been accepting the option but using its built-in
     skeleton anyway.
    Scanners that use REJECT no longer write past the end of their
     state buffer when a buffer larger than the default is installed
     with yypush_buffer_state() and a long token is then scanned. (#752)
    C++ scanners that use REJECT now allocate their state buffer with
     yyalloc() and release it with yyfree(), as C scanners do. Before,
     switching to an input buffer larger than the default could pass
     memory obtained with new[] to yyrealloc(), and a scanner that
     defines its own yyalloc(), yyrealloc() and yyfree() received a
     pointer its yyalloc() had never returned. (#751)
    Flex no longer writes one byte past the end of a buffer when the
     name of the output file given with -o is very long and contains
     enough backslashes or double quotes. (#749)
    The messages Flex prints are easier to translate, and more of them
     are offered to the Translation Project. The --help text is split
     into several messages. Words that must not be translated, such as
     option and keyword names, are no longer part of the messages. The
     statistics printed by -v and the dumps printed in debug mode are
     no longer marked for translation, so they appear in English. The
     messages in five source files that were never offered for
     translation now are, and the word "warning" at the start of each
     warning is translated. Seven short error messages, such as
     "premature EOF" and "bad character class", now say what is wrong.
    The --help text showed the -T option as --env.trace, and the message
     about using -l with --reentrant called that option --ctrl.reentrant.
     Both now show the right option names.
    Scanners generated with --tables-file or --tables-verify now check
     the tables file they read at run time. A damaged or hostile file
     could make such a scanner read outside its memory, write outside it,
     or ask for a huge amount of it. Now yytables_fload() returns -1 for
     such a file. A scanner that is already built is not changed, so it
     must be generated again with this version of Flex. (#730)
    With %array, a switch to another input buffer now ends the text
     saved by yymore(), as it does with %pointer. Before, calling yyless()
     with a count shorter than that text after the switch could move the
     scanner to before the start of the new buffer.
    With %array, calling yyless() with a count shorter than the text
     saved by yymore() now returns the rest of that text to the input, as
     it does with %pointer. Before, that text was dropped and never
     scanned again. With yylineno, the newlines in it are counted once.
    With %option yylineno, a newline matched by the default rule is now
     counted in yylineno. Before, yylineno did not change when the
     default rule matched a newline. (#397)
    With %array, calling yyless() after yymore() could write past the
     end of the input buffer. This has been fixed.
    A heap buffer overflow that could happen when flex_main() was called
     more than once in the same process has been fixed.
    Flex no longer puts #line directives from %top blocks into the
     output when --noline or %option noline is given. (#463, #268)
    A bug in how yylex_destroy() frees the buffer stack has been fixed.
    Refilling the input buffer is a little faster.
    When the input buffer is grown, the new size now always includes
     room for the final two end-of-buffer characters.
    Generated scanners now compile without warnings in more situations,
     for example with -Wextra-semi-stmt (#416), -Wundef,
     -Wnull-dereference (#377), when yyunput is disabled, and when
     comparing sizes.
    The error message for a file that cannot be opened now includes the
     system's reason.
    Some memory leaks have been fixed.
    Scanners generated with the --full option no longer allocate table
     space that is never used. (#628)
    Line numbers in #line directives were off by one after an indented
     code block in the rules section. This has been fixed.
    A leftover reference to the old location of the line directive
     template in the output filter was corrected.
    A crash while starting m4 on Apple M1 has been fixed. (#539)
    Scanners now fail with an error, rather than misbehaving, when
     yy_get_next_buffer() cannot find a buffer. (#525)
    The generated header flexint_shared.h can now be included twice
     without errors (#329), and it uses <cstdint> when compiled as C++11
     or later. (#517)
    New options: --noinput and --noyyinput, --noyyget_debug and
     --noyyset_debug. The existing --nounput can now also be written
     --noyyunput.
    Scanners that call yy_switch_to_buffer() with REJECT now always have
     a large enough state buffer.
    There are new function style interfaces to replace those that relied
     on C macros: yybegin(), yyecho(), yyreject(), yyinput(), yyunput(),
     yystart(), yyatbol(), yysetbol() and yypanic(). Macros that you used
     to define yourself are replaced by options: yydecl, yylmax,
     noyyread, extra-type, user-init, pre-action, post-action and
     bufsize. The old interfaces still work with the default back end but
     are deprecated, as is YY_FLEX_SUBMINOR_VERSION. The manual lists the
     replacements.
    Flex can now generate scanners in other languages. The new option
     -e, --emit (also %option emit) selects a back end. The default back
     end generates C or C++ as before. A new C99 back end generates only
     reentrant scanners and drops the legacy interfaces. The new %option
     rewrite controls whether calls to the function style interfaces
     below are rewritten for back ends that cannot rely on the C
     preprocessor.
    Generated scanners no longer need a separate table for NUL
     transitions.
    The indentation in the skeleton has been corrected.
    YYTABLES_NAME is no longer defined unless tables are requested.
    yy_top_state() now returns the current start condition when the
     start condition stack is empty, including in reentrant scanners.
    An option argument can now be "--", as in "flex --outfile -- file".
     (#285)
    Memory for filters is now allocated with calloc.
    A long standing bug that effected expressions of the form c{i,j}
     where 'c' is a character and {i,j} describes the number of times to
     match against 'c' when case sensitivity was turned on has been
     fixed.
    New option: --backup-file allows setting the name of the file
     written containing backing up information. Useful if you need
     backing up information from multiple scanners in the same directory.
    flex emits correct line number directives when line numbers refer to
     the file containing the line number directives.
    The options {no,}yy{get,set}_column are now supported.
test
    The test suite now works in VPATH builds, and the test programs it
     generates are ignored by git.
    The test suite no longer fails to build when many jobs run in
     parallel and finish in an unlucky order, because the parser objects
     now depend on the scanner headers they include.
    The shell scripts in the repository have been cleaned up using
     shellcheck.
    Many tests are now generated from *.rules files, so that each one
     runs against every back end. When running "make check", you can set
     TESTOPTS to pass options to flex.
    Generating the various tableoptions make rules is now more portable.
    Tests of the options -Cf and -CF will now run correctly on
     filesystems that are not case sensitive.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/flex                  |   1 +
 lfs/flex                                      |  11 +-
 ...lex-2.6.4-fix-build-width-glibc-2.6+.patch | 767 ------------------
 3 files changed, 7 insertions(+), 772 deletions(-)
 delete mode 100644 src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
  

Patch

diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex
index 2cb328657..a922fd559 100644
--- a/config/rootfiles/common/flex
+++ b/config/rootfiles/common/flex
@@ -8,6 +8,7 @@ 
 usr/lib/libfl.so.2
 usr/lib/libfl.so.2.0.0
 #usr/lib/libl.a
+#usr/lib/pkgconfig/libfl.pc
 #usr/share/doc/flex
 #usr/share/doc/flex/AUTHORS
 #usr/share/doc/flex/COPYING
diff --git a/lfs/flex b/lfs/flex
index 870827ec9..d62ab303b 100644
--- a/lfs/flex
+++ b/lfs/flex
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2026  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 2.6.4
+VER        = 2.6.15
 
 THISAPP    = flex-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -52,7 +52,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62
+$(DL_FILE)_BLAKE2 = 6ef916385340813265c9837ce3f7fa6af848028ac941d834de228e6a658480a4a0539bc596b9080192a98541a2ea8bf7565c1db80aff82799545e4a8036fb27a
 
 install : $(TARGET)
 
@@ -83,9 +83,10 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
 	cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
-		./configure --prefix=$(PREFIX) --disable-nls
+			./configure \
+				--prefix=$(PREFIX) \
+				--disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
diff --git a/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch b/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
deleted file mode 100644
index 328b57524..000000000
--- a/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
+++ /dev/null
@@ -1,767 +0,0 @@ 
-Backport of https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
-
-Bug: https://bugs.gentoo.org/628744
-
---- a/configure
-+++ b/configure
-@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
- Xsed="$SED -e 1s/^X//"
- 
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
-+  if ${ac_cv_prog_CPP+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CPP needs to be expanded
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
-+
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
- 
-+    done
-+    ac_cv_prog_CPP=$CPP
- 
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
-+ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.i conftest.$ac_ext
- 
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.i conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
- 
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details" "$LINENO" 5; }
-+fi
- 
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-@@ -3744,91 +3873,208 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
--$as_echo_n "checking for fgrep... " >&6; }
--if ${ac_cv_path_FGREP+:} false; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
-+if ${ac_cv_header_stdc+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
--   then ac_cv_path_FGREP="$GREP -F"
--   else
--     if test -z "$FGREP"; then
--  ac_path_FGREP_found=false
--  # Loop through the user's path and test for each of PROGNAME-LIST
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_prog in fgrep; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
--      as_fn_executable_p "$ac_path_FGREP" || continue
--# Check for GNU ac_path_FGREP and select it if it is found.
--  # Check for GNU $ac_path_FGREP
--case `"$ac_path_FGREP" --version 2>&1` in
--*GNU*)
--  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
--*)
--  ac_count=0
--  $as_echo_n 0123456789 >"conftest.in"
--  while :
--  do
--    cat "conftest.in" "conftest.in" >"conftest.tmp"
--    mv "conftest.tmp" "conftest.in"
--    cp "conftest.in" "conftest.nl"
--    $as_echo 'FGREP' >> "conftest.nl"
--    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
--    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    as_fn_arith $ac_count + 1 && ac_count=$as_val
--    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
--      # Best one so far, save it but keep looking for a better one
--      ac_cv_path_FGREP="$ac_path_FGREP"
--      ac_path_FGREP_max=$ac_count
--    fi
--    # 10*(2^10) chars as input seems more than enough
--    test $ac_count -gt 10 && break
--  done
--  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
--esac
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
- 
--      $ac_path_FGREP_found && break 3
--    done
--  done
--  done
--IFS=$as_save_IFS
--  if test -z "$ac_cv_path_FGREP"; then
--    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
--  fi
--else
--  ac_cv_path_FGREP=$FGREP
--fi
-+int
-+main ()
-+{
- 
--   fi
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdc=yes
-+else
-+  ac_cv_header_stdc=no
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
--$as_echo "$ac_cv_path_FGREP" >&6; }
-- FGREP="$ac_cv_path_FGREP"
--
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--test -z "$GREP" && GREP=grep
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <string.h>
- 
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "memchr" >/dev/null 2>&1; then :
- 
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- 
-+fi
- 
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
- 
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-+  $EGREP "free" >/dev/null 2>&1; then :
- 
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- 
-+fi
- 
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-+  if test "$cross_compiling" = yes; then :
-+  :
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
- 
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
- 
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
-+fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
- 
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
- 
-+fi
- 
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+
-+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-+if test "x$ac_cv_header_minix_config_h" = xyes; then :
-+  MINIX=yes
-+else
-+  MINIX=
-+fi
-+
-+
-+  if test "$MINIX" = yes; then
- 
-+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
- 
- 
-+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
-+
-+
-+$as_echo "#define _MINIX 1" >>confdefs.h
-+
-+  fi
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-+if ${ac_cv_safe_to_define___extensions__+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+#         define __EXTENSIONS__ 1
-+          $ac_includes_default
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_safe_to_define___extensions__=yes
-+else
-+  ac_cv_safe_to_define___extensions__=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
-+  test $ac_cv_safe_to_define___extensions__ = yes &&
-+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
-+
-+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
-+
-+  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
-+
-+  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
-+
-+
-+for ac_header in dlfcn.h
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DLFCN_H 1
-+_ACEOF
-+
-+fi
-+
-+done
- 
- 
- # Check whether --with-gnu-ld was given.
-@@ -6898,288 +7144,6 @@ func_munge_path_list ()
-     esac
- }
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
--$as_echo_n "checking how to run the C preprocessor... " >&6; }
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
--  CPP=
--fi
--if test -z "$CPP"; then
--  if ${ac_cv_prog_CPP+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--      # Double quotes because CPP needs to be expanded
--    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
--    do
--      ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--
--else
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
--else
--  # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
--  break
--fi
--
--    done
--    ac_cv_prog_CPP=$CPP
--
--fi
--  CPP=$ac_cv_prog_CPP
--else
--  ac_cv_prog_CPP=$CPP
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
--$as_echo "$CPP" >&6; }
--ac_preproc_ok=false
--for ac_c_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--
--else
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_c_try_cpp "$LINENO"; then :
--  # Broken: success on invalid input.
--continue
--else
--  # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
--
--else
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
--fi
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
--$as_echo_n "checking for ANSI C header files... " >&6; }
--if ${ac_cv_header_stdc+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_header_stdc=yes
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <string.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
--
--fi
--
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then :
--  :
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--#include <ctype.h>
--#include <stdlib.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      return 2;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--else
--  ac_cv_header_stdc=no
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--fi
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--$as_echo "#define STDC_HEADERS 1" >>confdefs.h
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do :
--  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
--"
--if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
--  cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--for ac_header in dlfcn.h
--do :
--  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
--"
--if test "x$ac_cv_header_dlfcn_h" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_DLFCN_H 1
--_ACEOF
--
--fi
--
--done
--
--
--
- 
- 
- # Set options
---- a/src/config.h.in
-+++ b/src/config.h.in
-@@ -207,6 +207,9 @@
- /* Define to the m4 executable name. */
- #undef M4
- 
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
- /* Name of package */
- #undef PACKAGE
- 
-@@ -239,6 +242,28 @@
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
- 
-+/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+
-+
- /* Version number of package */
- #undef VERSION
- 
-@@ -246,6 +271,16 @@
-    `char[]'. */
- #undef YYTEXT_POINTER
- 
-+/* Define to 1 if on MINIX. */
-+#undef _MINIX
-+
-+/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+#undef _POSIX_1_SOURCE
-+
-+/* Define to 1 if you need to in order for `stat' and other things to work. */
-+#undef _POSIX_SOURCE
-+
- /* Define to empty if `const' does not conform to ANSI C. */
- #undef const
-