gentoo resync : 15.10.2017

10 files changed, 887 insertions, 10 deletions

diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index eebc366d5818..3b42af2d6f78 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -5,7 +5,7 @@ DIST autogen-5.18.12.tar.xz 1018412 SHA256 be3ba62e883185b6ee8475edae97d7197d701
 DIST autogen-5.18.4.tar.xz 1017936 SHA256 7fbaff0c25035aee5b96913de2c83d9a5cc973b8dc08d6b7489ecbcfd72eb84b SHA512 a02363484de5019bd90fb6f2cf52b1b9556d6cf310c62a68830d0b2408ea4870d3c262fe5d1c27e3586ed3af4a7487d7422ad117760ac2a01ef3cfcfc1f2bfb6 WHIRLPOOL 109cb5637558f8e16cbb9afcb629a9bbd3d5ceae6b897a00101fce99b1a39b06ecc497d9b43441e40b58981dd2402027e89ce6ae76da73b73db934c64bca2b63
 EBUILD autogen-5.18.10.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
 EBUILD autogen-5.18.12.ebuild 1155 SHA256 4a08964e580574b6b92f9d8b306361163ae413f54943a249f6a3da52ae8d19c1 SHA512 ac21f0960ae9196d5214c125b2a55c2d8b0608b23d1f07d76dec31cec55eb1d158c46898d4f632cb67168a193820a40d364231a84268b3369f2d5b4fa2b82faa WHIRLPOOL d906ea64b6f01071711b045ca00ce71adb9b95d41c9b2c38f87f04d51be48a8ae9ec58fb3fbe575ec57f905e2ff4e4c671c07385ddd4ac90ba5bcce39c152898
-EBUILD autogen-5.18.4-r1.ebuild 1009 SHA256 62b3609c34610dd3037131503697bfd79d57b20c9b96c738659bd62afc5b6a3b SHA512 3c0ab7ef30de1e838f5a6c8658d14ddc86e96832606c5f206f1b4a9bba5dd65b63d0e6eb6d2aeb98e1b1f281b108553714e437337b90fcaac638bf914095e3c2 WHIRLPOOL c01d0339cf989730f30192f8d4bd0ad40f3fc8ed3cd995faec7c364b6d8b3843ac68a96c28bbe3c1b9fe6680fdc3926ea69d12fb09319eb4418391ed1761a97d
+EBUILD autogen-5.18.4-r1.ebuild 1008 SHA256 57775a93b5369946e348d6177a6d993f9f04d8bf77e9957d2c4d1ed5f2332f40 SHA512 d2525d55688addd145d7b7d6033139c716047fd2c19ea9e9c0b7ff20a3b06d69a1ffab660f1c952fc74e46abc78cec11e2c625b3af3cb4c2c550a5e981e261ce WHIRLPOOL 707af1e5705f1e482ec3660f16db6a0ff02534bb37834ee8533cbda028c2611671d529fd3b41de69617aa79230dbbf9ab444d98d94acb8e856a1e1b7eb3b1bd4
 EBUILD autogen-5.18.4.ebuild 988 SHA256 125667dd5f60611d45542c66efb441018f9d8b35ed42396752ed3c8e2c40db0b SHA512 703592e8e47e247aba37a140e015d25a46bd3c9d1b1cf4ad1ac49782e39b35b7a376cd27437d8f6969056d879630e0fb55d1e35fabddaa4730820ef549cf936b WHIRLPOOL 7cde847ec269488a190d27a19e16d39f8088e685a964115e2d4bff973bf49d21b78477df8b70f8201eb425567d20f7a64e5f92b279ae91c9102fbc9a1c082663
 MISC ChangeLog 5924 SHA256 6cf9205c2718a40dd62291e018e83598b8a790e348d83b4712e4572797759e93 SHA512 a30ca95519c3ee89ffb2bf7747414a863413813087ec4f5023503d7ba9557f402bb5d109da2f70568fca2705e2f49eecec8a6108f88feef990f550a596b78c29 WHIRLPOOL b63df1b7675cb72778fa3e0a53ef7df8ac25adbbbd7c67e4e219fe3232fc492d23aab2b3e602585714103c86b5d3c156dd9b576a8da950c138e5e99d09840f73
 MISC ChangeLog-2015 13238 SHA256 62ffc05bf40267540954659a8e6d8ce6111a1fc65c13edcfbba23c01989a1b2e SHA512 7a649ee0b718eb91376fa0a9672a4c2d7681d4c4341fc1a2685c71e594105f8cefa3366006413b2214189049f2a7eabbfcefd20ac289bab03d27b6c4778771ed WHIRLPOOL 8f00451bb3e8b1fda71b6178eca2d5f2e963767624df0a650f904730f395e398542bb5667078fc6dc29cff7cdfc20b99a59fe2a37be0a65aa62a378b07bccca0
diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index 3e0546e20d4a..b9f650ad7513 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index 0c85dca0affb..0e40c68da476 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -4,7 +4,7 @@ DIST crossdev-20160602.tar.xz 22292 SHA256 12dcbbdedc3f89a7b782c2b61c2956da050cf
 EBUILD crossdev-20151026-r1.ebuild 965 SHA256 68480dda88b0f5adf07f9ecf0669c0d1abf78dad60dad09b205933f1ca738aa5 SHA512 cd4084c2dcf43b410e35d4a99bc04b3fec726b3665834acb5dfd6403ec1cad86632a424fcac8afc72f98b3ab37f15e4de8ebb783c9dee81d4a472902a08b9da5 WHIRLPOOL 54d4a2d3fc80bd5d31d01729a792cea58d9b90ba478d5c3dc615035bb0af7364dba42c0674af6a1b9b7647f0aba246049a3595cc7c70c23067216d4608c701ce
 EBUILD crossdev-20160602-r1.ebuild 927 SHA256 88ad6609bbbbcd7b3af4770ea6ec71c6b7af3c2ef7619d68295d76bd43c18c28 SHA512 fb4831d068fbf4014322bea03ad49a4d458d2f0adff9a2d2a712215869bc5d8c057c6efca4e0f2997926cbecb343c9dee57441861317c38630d37fa4902560e7 WHIRLPOOL 3a659d2d084c2064fad9d6a1dfa217352978784ae667b14af8592790b2538b133b1087796dee478264b1366405b261d3d1e2db7661139ac59fb68dac0af12d98
 EBUILD crossdev-20160602.ebuild 978 SHA256 dee066c408d4f1f28abd288f44ff371cf1568266f16ed3deffcca580357fee85 SHA512 234953b134b82e5119e3333ab8b90c24dadcf6c498ac5f9be1a45d94f0c65f9b11b4d759a59a59284fc49ac20304777f8e05c7ee3d8920668f207d8df6fc8e2f WHIRLPOOL fe0608dafe2ac6c0449305e603a1a3bfe568e0de07eaafe2774dd70babed2eaed28aed5b1d34ac6998fe8076ebd88ef4cff7e285d800e142d6b62773b262f857
-EBUILD crossdev-99999999.ebuild 927 SHA256 88ad6609bbbbcd7b3af4770ea6ec71c6b7af3c2ef7619d68295d76bd43c18c28 SHA512 fb4831d068fbf4014322bea03ad49a4d458d2f0adff9a2d2a712215869bc5d8c057c6efca4e0f2997926cbecb343c9dee57441861317c38630d37fa4902560e7 WHIRLPOOL 3a659d2d084c2064fad9d6a1dfa217352978784ae667b14af8592790b2538b133b1087796dee478264b1366405b261d3d1e2db7661139ac59fb68dac0af12d98
+EBUILD crossdev-99999999.ebuild 863 SHA256 4f81437b6e5bebf83e72836dce21bfe38ca761fef08d1fd307e415c92e45688c SHA512 eb3a69d9e09b97ec56b036e6ff14ddf306e0971d7de0b6d5a0a21229058a095bf59b7d04d7960d24259af054bac72faab3b39f0f7fb7f05aa31c29dfcf62c9bf WHIRLPOOL 581c46f748072d878c9df18896213423a5c7b47a0e824eb8e69f9e2b9765d2d9f38023775bcf87053a0db06ae40392bf6ed21ef5f668f7a286f8e507c3deabe1
 MISC ChangeLog 7302 SHA256 81a0251e4cdc95041916226306b71aecca0e1204c1c2aea962fa800aa3bad179 SHA512 51c9f31a5887a6b55b0c2cb63279e62644baf9729e60b97c8f9222ed23f5b1eadad1a1aeeff81737e875404602b68bf672beb8a61345485d5fdc2dbbc1b1e893 WHIRLPOOL b5b953e13badceb3fb2b395498e0cacf56c59d6b04380ae76fcf980636e31f2e670621632c99af9d2d9ce49d59d2a8a97e5db111a85eb4df7f68f043ad4b50a0
 MISC ChangeLog-2015 21393 SHA256 a745a149451a73b6ec5524cdd805f5673aa53962414c51cb87e82ae626c696b6 SHA512 60d6f1b4b631b64a5a05ee1bc128e8e63f84852d434831a1d6f115d921bc9a70802a2ed6fe69983ad3af37d0fc314eb13aa03534f9b15de92a79d02d8ba592dc WHIRLPOOL 52b94d9cd41b844964ec49656879be0fc68bc9578a205cca32bd3004894fdb15c8f2cca9105b85a205567c14ee2806c698173740a4c3826cb967a625206b42d1
 MISC metadata.xml 430 SHA256 8097c98d7a184fc7efc881911e122a84127583a95bba9ba530dbc6fb62dab4fe SHA512 6a05b45977ecc06a9862ba62380f056148ea99a990f26769591e2ba4f2dc0ab231e292cb29371a3ad5d2ee77b7725e6df1271bbf141c32118abb83e4dd4d0212 WHIRLPOOL f812d97ee9896b88d922e722cdda38375f56a9e8d1b4b7d73f2898000cb86239c2716e164aaeb145c368200b17c3a9a88aa16712c0f67395a60dfbaf09ce6870
diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild b/sys-devel/crossdev/crossdev-99999999.ebuild
index aa413719ace2..724d297db4a2 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,10 +26,6 @@ RDEPEND=">=sys-apps/portage-2.1
 	!sys-devel/crossdev-wrappers"
 DEPEND="app-arch/xz-utils"
 
-PATCHES=(
-	"${FILESDIR}"/use-new-path-for-functions.sh.patch
-)
-
 src_install() {
 	default
 	if [[ "${PV}" == "99999999" ]] ; then
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a898b1973c94..1402f6560301 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,10 +1,13 @@
 AUX flex-2.6.3-reentrant.patch 2816 SHA256 461f0843bc4a1fe2ccea751453d89716502c31a374b5645703ec3a333427c5ac SHA512 105017a1020b339f08ce0c45c9c41ba6b5e42bb9dba22b258947f8d18ed697804c59e5cfa5e995b54652a54e6a500ccb2036b38001bab433d7af6f01c71feda4 WHIRLPOOL 259d44d39dd3e01613654d694b1356661074532a58955356ba4c707ed2f16fe786d9c065b54517bca7f5504e45e507732050e0d1345d4b5ebe69241d5ee346d2
+AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 SHA256 5800f9abcfafebcdc1115bc7791af6c9da757f7f33ae425268ad94640d231aef SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135 WHIRLPOOL cd41142bfe03075aaf727b5a718a17204dc4698bac703723a9a1d602ff44071f8b6d9985187c7b3f750999f1f6cd47ddeccc112ddcb81f243d158cf5cd5e4b1f
+AUX flex-2.6.4-libobjdir.patch 770 SHA256 4654e3b9aa13e220b12b797335ed910b4c15ce553848ec2a54f728f0ca550110 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86 WHIRLPOOL 73882a6121d6084fb0f0dad389af044f5f645545f81ca5c30fdfd1a2c3bef818c6b5e77272b3747e7b7ed24de9a6902fd70aa9c111d2ef40a57b40444955bc35
 DIST flex-2.6.1.tar.xz 835048 SHA256 2c7a412c1640e094cb058d9b2fe39d450186e09574bebb7aa28f783e3799103f SHA512 1e35d0447f59139b98ede085d1a603d4f61cf8bc11cf2e291a3f492a05c60ee61535481b878585cd6843cd9b3c7952c834adfa78a6a71c64802e7b3069dec9d1 WHIRLPOOL d671017fd516f5d6457a896f1d50d4a4d310d32476a6db8f1ed99305a96955eec7586d8ef2aff1e03795be3f7417e0f1d8925b073788a14abcdd38868822eb67
 DIST flex-2.6.3.tar.gz 1405560 SHA256 68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa SHA512 f14b1af7ddd148660737991787fcf13d86cc0bef3859ed6c2135963373e76524d70382795c845cb6491b0435f8c40ba81e17f15267592b8d1656cfd4c3430b00 WHIRLPOOL 266266c4c15135fe52ec3b5226645b89c7053ec4dac257c9349d760601eaf50f7ec504d3c4b74951fd415d17299c2ca2e483e8c8c7f8ee936b4822d92603a4e2
 DIST flex-2.6.4.tar.gz 1419096 SHA256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e WHIRLPOOL b19880ae3d760e04138ca93c848da07baa004bd193616855f1e650a170648288727d6a2bb5e657f05b204505d4b5b70e76a795037c81c6a19e1767cebadf8204
 EBUILD flex-2.6.1.ebuild 1913 SHA256 ee0c9e6314da38de312f2884ac7fff9bfda1bf0de90cda2ec9cc55bb0969edeb SHA512 c0c4baca0a0e4373599be51d6490b46b25ef39d3fbf251a2bd531f438800e1f9dfaec839e9f8c72a66c1928896cfdb69fe52049ab1e1843d9c151ff21be0542e WHIRLPOOL 0b3c6734c549fd5d61ad44dce75d361e168564b793667282de63ca6fafdd7b7146ba4266f8bd65119844421e5563afc838bdc5e4b60dd2b814b12228afd138e5
 EBUILD flex-2.6.3-r1.ebuild 2061 SHA256 a71c37379d143e3abcb1f05fce3ffccce5877d8e17ad42bfc95a114f09058971 SHA512 d798c09ce136155b5e67b144d6eb3ac0e394caf0445678fa1e3e887f2c766fa6975fe2288b843a3f7ef6631193986621dcc2f4d46142ca73e693384d2f8b61e5 WHIRLPOOL a23f58c72c4d6ce243842485236db003198b89356a5e3b3a641ecf0dfe9841d813661b312dfbc597c90e9984e2d0df327b12726e50212f7516debdfe0740afda
 EBUILD flex-2.6.3.ebuild 1987 SHA256 ab00926b33bfb3998722f58731189312c0db1c6279f77573851347b02e6f1816 SHA512 54737594a12c82faf520ac12a3fe9d17b8b2658d9d6736ad25db58686250e2e97ef27c5341df96fa28ca78376f607d139ca6bea85f00ec5e8d52360b94df336f WHIRLPOOL a944131ecfc0e1e71ecf5bccca80e4b5e4bc5534a31367aa55ef2fd9830908d0777c6d00ced7057667689ebd26c98227accdc8c39400c478a492c653731afb9d
+EBUILD flex-2.6.4-r1.ebuild 2111 SHA256 7f384a46a51615d02f879730afa25f9369c0a5c66437488bf594d36128f1d4c7 SHA512 2121ed0c99196303041e8c5713ee43944c165bf5108d9c5fc02cebc12de5356af9a47c7b59d044804f35c64d9f3cdfe7778202b611382f359f097ca5bef42933 WHIRLPOOL 1edc2d0b159307ab73fade41a50fc83f1a560451bc611b7d7adb5b98c4706cf04efe6b481709cf010e6138e7fe9ac0727a7ffde6a679107b2156a7330111f94b
 EBUILD flex-2.6.4.ebuild 2026 SHA256 62707a253c137ef5f571a80e297e7607a7055b2ce2aa3efce719a2e2fc927b2e SHA512 4070f280ecf38f09cfd9210b41b5e42d12e2f4da06cf5db775c6738624016a3f58b9b2367b47f6b8a5b1d1b78730922b2c56582d5e93988dfd1edcb6b2e088cc WHIRLPOOL 9d0454152ecc9ef55073d38baf10537278b59f65d146877d14a05b9d744a6571143d7a464d0b16c27227d5cfbe33e047f2074bf268dc5e9dbe122ee8b3645ccf
 MISC ChangeLog 5656 SHA256 1d23877b1b816e90923b7e932f8e4d673e95d2ad3aa5db8814518f29623c6388 SHA512 4e09457657a237398e8b3833c7c934879686527059267cb59b17597ff84bc1a1a565b84f03c86583bbaa246d183a22570ea6627305e167c955cc1ad4db0f9106 WHIRLPOOL 98e7b57d707a18fd7fe5be6464fbedac1953d3beac9c6c251df9b4627da55b82c3c9f844a335645eab33534ed5710ded404abf035f5cf974e5f306181175e8b0
 MISC ChangeLog-2015 14123 SHA256 559935be9fec248b903e470b5e311f39e4e44790aad69495b78410e469604fc1 SHA512 673d316fb9a79bb40b7e241a2653009fecccabcefb7c159b078a31c4b8eac8755c8e404bdeeb3f4d871e6cef63faf7ece9e2b8625331a06f4c618349cf1102bd WHIRLPOOL f12d6b587e8cd44f7b17741da51db8213128f9a9a562d19aab872dba2b20e54e2ebcf35b74b0e195e1faf884c1abca0bc584bce66fceb14049d53606f691bce7
diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
new file mode 100644
index 000000000000..328b57524565
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.6+.patch
@@ -0,0 +1,767 @@
+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
+ 
diff --git a/sys-devel/flex/files/flex-2.6.4-libobjdir.patch b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
new file mode 100644
index 000000000000..a652b9236b1c
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.4-libobjdir.patch
@@ -0,0 +1,26 @@
+https://github.com/westes/flex/commit/24e73c4446841eda8d4ea01298e887059e8c1472
+
+Bug: https://bugs.gentoo.org/625508
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -79,6 +79,8 @@ COMMON_SOURCES = \
+ 
+ LDADD = $(LIBOBJS) @LIBINTL@
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ include_HEADERS = \
+ 	FlexLexer.h
+ 
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1688,6 +1688,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+ @CROSS_TRUE@$(stage1flex_OBJECTS): CPPFLAGS=$(CPPFLAGS_FOR_BUILD)
+ @CROSS_TRUE@$(stage1flex_OBJECTS): LDFLAGS=$(LDFLAGS_FOR_BUILD)
+ 
++$(LIBOBJS): $(LIBOBJDIR)$(am__dirstamp)
++
+ skel.c: flex.skl mkskel.sh flexint.h tables_shared.h tables_shared.c
+ 	$(SHELL) $(srcdir)/mkskel.sh $(srcdir) $(m4) $(VERSION) > $@.tmp
+ 	mv $@.tmp $@
diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..b221d35914bf
--- /dev/null
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic libtool multilib-minimal
+
+DESCRIPTION="The Fast Lexical Analyzer"
+HOMEPAGE="https://flex.sourceforge.net/ https://github.com/westes/flex"
+SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="FLEX"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static test"
+
+# We want bison explicitly and not yacc in general #381273
+RDEPEND="sys-devel/m4"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	nls? ( sys-devel/gettext )
+	test? ( sys-devel/bison )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.4-libobjdir.patch
+	"${FILESDIR}"/${PN}-2.6.4-fix-build-with-glibc2.6+.patch
+)
+
+src_prepare() {
+	default
+
+	# Disable running in the tests/ subdir as it has a bunch of built sources
+	# that cannot be made conditional (automake limitation). #568842
+	if ! use test ; then
+		sed -i \
+			-e '/^SUBDIRS =/,/^$/{/tests/d}' \
+			Makefile.in || die
+	fi
+	elibtoolize # Prefix always needs this
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# Do not install shared libs #503522
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-shared \
+		$(use_enable nls) \
+		--docdir='$(datarootdir)/doc/'${PF}
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		cd src || die
+		emake -f Makefile -f - lib <<< 'lib: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake check
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		default
+	else
+		cd src || die
+		emake DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	dodoc ONEWS
+	prune_libtool_files --all
+	rm "${ED}"/usr/share/doc/${PF}/COPYING || die
+	dosym flex /usr/bin/lex
+}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 23f074641539..44400c696695 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -3,7 +3,7 @@ DIST gcc-config-1.7.3.tar.xz 15088 SHA256 2c6cca69a028f157dc54e19ea10efc240e0d26
 DIST gcc-config-1.8.tar.xz 15020 SHA256 2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826 WHIRLPOOL 4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
 DIST gcc-config-1.9.0.tar.xz 17468 SHA256 3e0acf3fe683dc6193b0135fe4b26ce7f959210296fff040a10bccc33a247d1a SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc WHIRLPOOL ed341f1fa72958008d4e1c1a814a2cf025be7404d21c963c6b82c36dc951ba15849f7809211fb21e5fb4a18ce5c12f4f4b36242822e568d4b4f39a8f9f26aa0a
 EBUILD gcc-config-1.7.3.ebuild 1022 SHA256 d4be3de8d2b3d47dcb586d842cb4188262dd35c41c22c3cf7d3eb518bd39ad91 SHA512 e48c80cfc24c0d701594fd53dc9ea7875bb8d4a43022331093db33d3a8d0b2652c9216e79c4f245b583f62a324a3ad9e2438adcf4cea53de4027e3de3cb84061 WHIRLPOOL 420869fffcd7f959a8164b58463c1ec7dfdcea574d6897320f429df531128a9c5ca69bc47b5ed10ad9414265e0b0e854bb45d9c8d0f05a87d4ff80dd03814c9b
-EBUILD gcc-config-1.8-r1.ebuild 1182 SHA256 d3843e2910bb994ae6c5cc8635088e817a8c647086f20f32b2b6e3b76350a055 SHA512 615a3b5bec263f1268c42dece25ecbc644b9f701e6b1f69c14b48194c122ee1f54160bf513aedfa210b0a542c4db8f9639dac27f49903621b96840d4714206e2 WHIRLPOOL 0b63c772319f1440db4e91ac2cd30ea31692ab3024bd32350e3c5c6a41593edb6dabd0ac31b2679f7f44bac55501a020a27b1fdabf1c9a62f8c800861bd9787a
+EBUILD gcc-config-1.8-r1.ebuild 1180 SHA256 079a64f6d28805b73294745a86eed6994d6e319100a6d46a01926fcd08f8cb1d SHA512 ba3676f5d8a8fce1fd06f954d9a6c8cbf105f82dae50d562b0cc385812fe583482d33586e69924148e344ffae892927c0d7aa26d92019f985f456695d3b0c8cb WHIRLPOOL cd0b2e22192d2d63f07d231c1eca1eea341492f63034e6162110038547100c852c61dba23008741cae0465e2075bf68000179889e68eff7cc2a167aff61d8644
 EBUILD gcc-config-1.8.ebuild 1035 SHA256 3a51617ea066a94c043f7d9e637c0a0fed064f7e3a99c7285e56f26096da8821 SHA512 8ed8f187fbb6c50f019a94826798c427f0d7647ca5a4369a551bc5e8571f4ac337c3c99066e1f6ae5ac562723500f1a718a2cbe3f54f24535caf7c4264a33620 WHIRLPOOL 3f41ddb2aab0446cdd0748db83c49a392913a5ddec99ac2a29a965e9e4eb82c1ec8aec4d34d835f65e329db26dc29c98782d48d7771b41d9a0214c67a6a5730e
 EBUILD gcc-config-1.9.0.ebuild 1079 SHA256 0645387c1a8188fae5f24d3a230913394d2504a8fe5ea89908945ce0c5bf8ccb SHA512 a91175f3690253014f695d45a52269c57bc7d6365a38b00d902502bde984d02aac6c59f28f2475c84dfecd2b538441a6c8b49ab92713c67d3dab84715d767d47 WHIRLPOOL c240040acc2a9ac7843cfa5ee1caafb1fb4010904dfc9816844087b0e4a6dc767b10d0765534d3548fd1394d3e559bea051b11b44250d24c4df85bbeab66720a
 MISC ChangeLog 4613 SHA256 ac0232e8affa3a08338c69ee52e3b940d915ed33a4a12d140e1bc8a2fe06d67d SHA512 d5b53be1dfd0160cb6c8fbba02317bc70c3eb48bf1cf08779029a77072549ebee21edccf819e3193d262291d11621fdfebc19c1b3978566c2fc3050c4b1786f8 WHIRLPOOL 26a1d4e53efa5e223f93b2510d71c5b50b7970fe332810f8c43d6c74dcda50e36fe49fc2ebf9b4a05077a984d2f39273cd8773fb04adec8406ed008196cfcfbc
diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
index 48324fc6aec0..fe4b4fbf8cad 100644
--- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"