From e5985b8e66b3b43c34328efb47b9b12e8ce5a690 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Oct 2022 03:58:39 +0100 Subject: gentoo auto-resync : 28:10:2022 - 03:58:39 --- sys-devel/Manifest.gz | Bin 10478 -> 10474 bytes sys-devel/flex/Manifest | 6 +- .../flex-2.6.4-fix-build-with-glibc2.26.patch | 219 +++++++++++++++++++++ .../flex/files/flex-2.6.4-implicit-func-decl.patch | 50 ----- sys-devel/flex/flex-2.6.4-r1.ebuild | 83 -------- sys-devel/flex/flex-2.6.4-r3.ebuild | 95 --------- sys-devel/flex/flex-2.6.4-r4.ebuild | 93 +++++++++ 7 files changed, 315 insertions(+), 231 deletions(-) create mode 100644 sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch delete mode 100644 sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch delete mode 100644 sys-devel/flex/flex-2.6.4-r1.ebuild delete mode 100644 sys-devel/flex/flex-2.6.4-r3.ebuild create mode 100644 sys-devel/flex/flex-2.6.4-r4.ebuild (limited to 'sys-devel') diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz index c6e9e5fa8e0c..504f5def3482 100644 Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest index 0c527e387c4f..9de000c0d438 100644 --- a/sys-devel/flex/Manifest +++ b/sys-devel/flex/Manifest @@ -1,8 +1,8 @@ +AUX flex-2.6.4-fix-build-with-glibc2.26.patch 8623 BLAKE2B 59433c6a35a05633a9e960c3d6a0248e9bf5606ca7b1376df1594b7f42e23f2e06eb04850b4f9f84f88dc820c6a6e8d88e23aee09451392ed494a71e0a147a37 SHA512 7d13f056181b4859c7bd0f3b494f8e684eb46f499004f3e9f8121382adbf59c7bdd0f26b9105e90fdeb3ee09184743859074993012f6144feb2299343ea95f54 AUX flex-2.6.4-fix-build-with-glibc2.6+.patch 20281 BLAKE2B 859e15a65473a74635db3759f3607fd6a96ffa0949a1b532bd31ad589391d9fee9f14b04c741b3e50224f5e31ce987398344009d8cdb20dadfa15383b6f03067 SHA512 e9a03bf18a6fbc3546d96213cb483d46fa0b18609e03b37c4e5ac5427935d2694bd86ee73cf5c28ffd6bd7cec018f203e82e7c685e9426a7ba2e6d60d2a44135 -AUX flex-2.6.4-implicit-func-decl.patch 1911 BLAKE2B bb4fea60d5b4650d734d761294e2dc91c71d8f9b90c920ac95aeb6c84ee8e08a80e8092ea337aa31f3de183f6da27fde8b43d679d8e19297bc0d225e9bb975d0 SHA512 4d4466e1c8dd9608a9fc0fb0ad37997bc3646f7cbccf7b2d209af302266cbe3f6dc3ed72ead660b4223833bde645343301a698db49544606568d18af5c32d0b1 AUX flex-2.6.4-libobjdir.patch 770 BLAKE2B 0771af247117123e3efed3e2a0c8a71573c81dc1e8d2e364a887aa49d3bf3a5198042396d1df1e2c0ae196df098241eba0e2b35e953f9a5be3d43d2408a97536 SHA512 76e3a3e19fe9c9b6b3e0fcfea98feb0eaf03fdc683e3695045b3246b57538a52842b455a9aebed87548d2b8ee3e7d34dca5ff355f06648911866b3b621b40f86 +DIST flex-2.6.4-autotools-regenerate.patch.xz 282588 BLAKE2B 3995b8b5e354a43b1a4ff72fae76027c904ddb24eb8e5d55fc6fbe81299f48fa70ac3c4a98b9ed39aca8a98190d6db5005cacb96ec1016d413860d84a434dcc0 SHA512 9efd3197fdf7f8435dfbf4dafbe6b99c1fafede0ec364dbeb9cca81711763d693bc5d30fc3b2af038a44f8848577d19dd737e3afe0cd3b08ab79daea64fcdefa DIST flex-2.6.4.tar.gz 1419096 BLAKE2B c003d4f764f7f4d41e33af7ee28c2af272a9f0aee6ba7c2494ba96722d8d0b18f7a3f745217e9a2cecb43b6863328267a810280670c04464156b3eb3d7ee9d62 SHA512 e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e -EBUILD flex-2.6.4-r1.ebuild 2022 BLAKE2B 82ba69679aa66e9e66a3e36c037e01902394f9f99e2e057477e3c3f30f5c55a9c0a6c52c69d3a6d6df118f0cbac0c95500e04d17ec01481baf64c7997287d588 SHA512 e25615e3b8f985e07d0c0c6175467484ba09c817e411eb0cb2d30da6ecb036a316745270def159c9e294af506115adcf1c7e0ceb1aa267f2fa280d1ffc1d7d09 EBUILD flex-2.6.4-r2.ebuild 2326 BLAKE2B 39ec3e1f7392d4705f36a513c6161ddbe147a311d8eecd08e66f1f7ba7cea20dc16b98acc3a280560f66e74766945fc2d47e3ef8d44c1eaac73e0e0c889968b1 SHA512 ed939eea185f0cbc27c2128c3b248494ef66b19f2b6106dce04ab9019a8d9b9d01b40233b44399ba231663938718c76f4ba7eab8b4c8cbedec91180453684126 -EBUILD flex-2.6.4-r3.ebuild 2379 BLAKE2B 4ec76a4aaa73d5bb4145f515d65dd9a86d867ad8fe7b1904fa1916dc6aec42f491a9a2c8a0d896e371dd8b6c5a818b10a148ff3887ec27785324b24936f3dedb SHA512 eef7a159af9235d934cfc8b705b8e35e3a56f379c40957178a77ac9ad5fa0ac00bf5d3cd772520cd11db82e4806f7c13884bae0b7fe0ad9c3ded1392822d1c8b +EBUILD flex-2.6.4-r4.ebuild 2333 BLAKE2B 0a052ac0a780fc07a4b98f49c45642a558e6c2ddf27560fc51aaac7c69344bc815849d7af1ba3c5c924930a0ec063c4d62769331f1fdf1d4b13f265cb1ff7755 SHA512 4193c862637891722c9bf187c72c8aa814528d12aae06836c80c4c9ceb851cd2a0fff9818cc46178b4ef9a388ce3027c7cfca4b6b914184fc3bdea7481473a34 MISC metadata.xml 444 BLAKE2B 28bd0cd35c6ab4386dffdf221e6b43927e47971bea62a0f0395e3cd6725567114675055dc1267ce5ffbd42fe4731a806b4e5666ea6b83ad4bcf4d35b5529ce85 SHA512 53f91d714d7f4401f7d986d743c08a817d794147f9b277d829a4e8065ce91ce00123cd5b42957af60ef9051568a214b7ce791aa8a4baf82a5179859971357d56 diff --git a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch new file mode 100644 index 000000000000..9a9de8746b89 --- /dev/null +++ b/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.26.patch @@ -0,0 +1,219 @@ +https://github.com/westes/flex/issues/436 +https://bugs.gentoo.org/705800 +https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray +https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda +https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380 +https://github.com/westes/flex/commit/0db9f8903a446e7026874be519b8dc55a471f014 +https://github.com/westes/flex/commit/a17d79e9c722a6735b6d2a8f152287404f27df32 +https://github.com/westes/flex/commit/4081efa0831b15d7e4e4255401c225ad8262426d +https://github.com/westes/flex/commit/1985bb3c7abed940e91ad816504ef08a18c3b7c1 + +From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Mon, 4 Sep 2017 08:28:53 +0800 +Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l + +config.h may define macros that alter the API of the standard library +funtions, and so it should be included before any other standard +header, even before the skeleton's standard header inclusion. + +For example: config.h may #define _GNU_SOURCE that would expose the +reallocarray() prototype from on glibc 2.26+ systems. If we +include before config.h, reallocarray() would not be +available for use in lex file since the second include doesn't help +due to header guard. + +For now our config.h might `#define malloc rpl_malloc` -- this +substitution must work before including stdlib.h, or else the compiler +will complain about missing prototypes, and may result in incorrect +code in scan.l (gcc warning: return makes pointer from integer without +a cast [-Wint-conversion]). + +Fixes #247. +--- a/src/scan.l ++++ b/src/scan.l +@@ -1,5 +1,11 @@ + /* scan.l - scanner for flex input -*-C-*- */ + ++%top{ ++/* flexdef.h includes config.h, which may contain macros that alter the API */ ++/* of libc functions. Must include first before any libc header. */ ++#include "flexdef.h" ++} ++ + %{ + /* Copyright (c) 1990 The Regents of the University of California. */ + /* All rights reserved. */ +@@ -32,7 +38,6 @@ + /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ + /* PURPOSE. */ + +-#include "flexdef.h" + #include "parse.h" + extern bool tablesverify, tablesext; + extern int trlcontxt; /* Set in parse.y for each rule. */ + +From 24fd0551333e7eded87b64dd36062da3df2f6380 Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Mon, 4 Sep 2017 10:47:33 +0800 +Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac. + +This would, e.g. define _GNU_SOURCE in config.h, enabling the +reallocarray() prototype in glibc 2.26+ on Linux systems with that +version of glibc. + +Fixes #241. +--- a/configure.ac ++++ b/configure.ac +@@ -25,8 +25,10 @@ + # autoconf requirements and initialization + + AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex]) ++AC_PREREQ([2.60]) + AC_CONFIG_SRCDIR([src/scan.l]) + AC_CONFIG_AUX_DIR([build-aux]) ++AC_USE_SYSTEM_EXTENSIONS + LT_INIT + AM_INIT_AUTOMAKE([1.15 -Wno-portability foreign std-options dist-lzip parallel-tests subdir-objects]) + AC_CONFIG_HEADER([src/config.h]) + + +From 0db9f8903a446e7026874be519b8dc55a471f014 Mon Sep 17 00:00:00 2001 +From: Lukasz Baj +Date: Fri, 22 Sep 2017 10:24:46 +0200 +Subject: [PATCH] build: Remove custom reallocarray() declaration. + +Use one from instead because that is more portable. +--- a/src/flexdef.h ++++ b/src/flexdef.h +@@ -631,10 +631,6 @@ extern int sectnum, nummt, hshcol, dfaeql, numeps, eps2, num_reallocs; + extern int tmpuses, totnst, peakpairs, numuniq, numdup, hshsave; + extern int num_backing_up, bol_needed; + +-#ifndef HAVE_REALLOCARRAY +-void *reallocarray(void *, size_t, size_t); +-#endif +- + void *allocate_array(int, size_t); + void *reallocate_array(void *, int, size_t); + + +From a17d79e9c722a6735b6d2a8f152287404f27df32 Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Sat, 14 Oct 2017 00:36:54 +0800 +Subject: [PATCH] scanner: Define _POSIX_C_SOURCE when needed in skeleton. + +The function fileno() is defined by POSIX. When flex would otherwise not provide that feature macro, we define it. + +Fixes #263 +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -218,6 +218,14 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], + + /* begin standard C headers. */ + %if-c-only ++m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]], , ++[[m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]], , ++[[#ifndef _POSIX_C_SOURCE ++#define _POSIX_C_SOURCE 1 /* for fileno() */ ++#ifndef _POSIX_SOURCE ++#define _POSIX_SOURCE 1 ++#endif ++#endif]])]]) + #include + #include + #include + +From 4081efa0831b15d7e4e4255401c225ad8262426d Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Thu, 8 Mar 2018 10:04:36 +0800 +Subject: [PATCH] scanner: Fix glibc features.h dependency in skeleton. + +Commit a17d79e9c722a6735b6d2a8f152287404f27df32 defines _POSIX_C_SOURCE +to the minimum of 1 if it's not defined in the user's scanner code or +the compiling environment. However in glibc the macros are not yet set +up until one of the libc headers is included. This unfortunately have +made us overwrite the default _POSIX_C_SOURCE value that would be +defined by glibc (200809L at the time of writing), causing regressions +in user code. + +Now in this patch: +1. Ensure feature test macros have been set up in glibc before checking +or defining any of them in our skeleton code. +2. Have a more conservative logic when determining the need to define +_POSIX_C_SOURCE (required for fileno()). + +Fixes: #313 + +Note: +It could be tricky for application code to ensure feature test macros +have been set up in glibc, since is no portable header and +not meant to be included directly by applications. The way to do it is +to include a libc header which in turn includes . However, +many of the glibc headers check __USE_POSIX (a glibc internal macro +defined if _POSIX_C_SOURCE is defined) and determine which interfaces +to expose already, making the headers inappropriate for our goal. +Those which don't depend on _POSIX_C_SOURCE, and are also available +since ANSI C89, are only , and . + + is finally favored due to other considerations: +- check for __USE_XOPEN in glibc, making a dependency on +_XOPEN_SOURCE, besides it exposes much more interfaces than we need. +- In djgpp, depends on _POSIX_SOURCE to hide definitions of +some errno values when it's defined. +- exposes the fewest interfaces among the 3 headers and, at +the time of writing, checks for only C99 (for __func__), C11 (for +_Static_assert), and _GNU_SOURCE when needed. + +Signed-off-by: Kang-Che Sung +--- a/src/flex.skl ++++ b/src/flex.skl +@@ -220,11 +220,21 @@ m4_ifdef( [[M4_YY_TABLES_EXTERNAL]], + %if-c-only + m4_ifdef( [[M4_YY_ALWAYS_INTERACTIVE]], , + [[m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]], , +-[[#ifndef _POSIX_C_SOURCE +-#define _POSIX_C_SOURCE 1 /* for fileno() */ +-#ifndef _POSIX_SOURCE +-#define _POSIX_SOURCE 1 ++[[/* Feature test macros. Flex uses functions that require a minimum set of ++ * macros defined. As defining some macros may hide function declarations that ++ * user code might use, be conservative and respect user's definitions as much ++ * as possible. In glibc, feature test macros may not be all set up until one ++ * of the libc header (that includes ) is included. This creates ++ * a circular dependency when we check the macros. is the safest ++ * header we can include and does not declare too many functions we don't need. ++ */ ++#if !defined(__GNU_LIBRARY__) && defined(__STDC__) ++#include + #endif ++#if !(defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ ++ defined(_POSIX_SOURCE)) ++# define _POSIX_C_SOURCE 1 /* Required for fileno() */ ++# define _POSIX_SOURCE 1 + #endif]])]]) + #include + #include + +From 1985bb3c7abed940e91ad816504ef08a18c3b7c1 Mon Sep 17 00:00:00 2001 +From: Explorer09 +Date: Thu, 8 Mar 2018 09:53:24 +0800 +Subject: [PATCH] scanner: correct comments about __STDC_LIMIT_MACROS. + +No code changes. + +Signed-off-by: Kang-Che Sung +--- a/src/flexint.h ++++ b/src/flexint.h +@@ -7,8 +7,8 @@ + + #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, +- * if you want the limit (max/min) macros for int types. ++/* C++ systems might need __STDC_LIMIT_MACROS defined before including ++ * , if you want the limit (max/min) macros for int types. + */ + #ifndef __STDC_LIMIT_MACROS + #define __STDC_LIMIT_MACROS 1 + diff --git a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch b/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch deleted file mode 100644 index 1900ae0529b9..000000000000 --- a/sys-devel/flex/files/flex-2.6.4-implicit-func-decl.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/westes/flex/commit/4b5111d9772b5c160340ca96f08d30d7f6db5cda -https://github.com/westes/flex/issues/436 -https://bugs.gentoo.org/705800 -https://developers.redhat.com/blog/2019/04/22/implicit-function-declarations-flexs-use-of-reallocarray - -From 4b5111d9772b5c160340ca96f08d30d7f6db5cda Mon Sep 17 00:00:00 2001 -From: Explorer09 -Date: Mon, 4 Sep 2017 08:28:53 +0800 -Subject: [PATCH] scanner: Include flexdef.h at %top block of scan.l - -config.h may define macros that alter the API of the standard library -funtions, and so it should be included before any other standard -header, even before the skeleton's standard header inclusion. - -For example: config.h may #define _GNU_SOURCE that would expose the -reallocarray() prototype from on glibc 2.26+ systems. If we -include before config.h, reallocarray() would not be -available for use in lex file since the second include doesn't help -due to header guard. - -For now our config.h might `#define malloc rpl_malloc` -- this -substitution must work before including stdlib.h, or else the compiler -will complain about missing prototypes, and may result in incorrect -code in scan.l (gcc warning: return makes pointer from integer without -a cast [-Wint-conversion]). - -Fixes #247. ---- a/src/scan.l -+++ b/src/scan.l -@@ -1,5 +1,11 @@ - /* scan.l - scanner for flex input -*-C-*- */ - -+%top{ -+/* flexdef.h includes config.h, which may contain macros that alter the API */ -+/* of libc functions. Must include first before any libc header. */ -+#include "flexdef.h" -+} -+ - %{ - /* Copyright (c) 1990 The Regents of the University of California. */ - /* All rights reserved. */ -@@ -32,7 +38,6 @@ - /* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */ - /* PURPOSE. */ - --#include "flexdef.h" - #include "parse.h" - extern bool tablesverify, tablesext; - extern int trlcontxt; /* Set in parse.y for each rule. */ - diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild b/sys-devel/flex/flex-2.6.4-r1.ebuild deleted file mode 100644 index 309967cc2b37..000000000000 --- a/sys-devel/flex/flex-2.6.4-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic libtool multilib-minimal toolchain-funcs - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general #381273 -RDEPEND="sys-devel/m4" -BDEPEND="${RDEPEND} - 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 \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - --disable-shared \ - $(use_enable nls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -C src -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 - emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - find "${ED}" -name '*.la' -type f -delete || die - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - dosym flex /usr/bin/lex -} diff --git a/sys-devel/flex/flex-2.6.4-r3.ebuild b/sys-devel/flex/flex-2.6.4-r3.ebuild deleted file mode 100644 index 1f1ebfe61893..000000000000 --- a/sys-devel/flex/flex-2.6.4-r3.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic libtool multilib-minimal toolchain-funcs - -DESCRIPTION="The Fast Lexical Analyzer" -HOMEPAGE="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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="nls static test" -RESTRICT="!test? ( test )" - -# We want bison explicitly and not yacc in general, bug #381273 -RDEPEND="sys-devel/m4" -BDEPEND="${RDEPEND} - 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 - "${FILESDIR}"/${P}-implicit-func-decl.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). bug #568842 - if ! use test ; then - sed -i \ - -e '/^SUBDIRS =/,/^$/{/tests/d}' \ - Makefile.in || die - fi - - # Prefix always needs this - elibtoolize -} - -src_configure() { - use static && append-ldflags -static - - multilib-minimal_src_configure -} - -multilib_src_configure() { - if tc-is-cross-compiler ; then - # Similar to workaround for procps: - # - bug #705800 - # - https://sourceforge.net/p/psmisc/bugs/71/ - # - https://lists.gnu.org/archive/html/autoconf/2011-04/msg00019.html - export ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes - fi - - # Do not install shared libs, #503522 - ECONF_SOURCE="${S}" econf \ - CC_FOR_BUILD="$(tc-getBUILD_CC)" \ - --disable-shared \ - $(use_enable nls) -} - -multilib_src_compile() { - if multilib_is_native_abi; then - default - else - emake -C src -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 - emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS - fi -} - -multilib_src_install_all() { - einstalldocs - dodoc ONEWS - find "${ED}" -name '*.la' -type f -delete || die - rm "${ED}"/usr/share/doc/${PF}/COPYING || die - - dosym flex /usr/bin/lex -} diff --git a/sys-devel/flex/flex-2.6.4-r4.ebuild b/sys-devel/flex/flex-2.6.4-r4.ebuild new file mode 100644 index 000000000000..14ad4c2ba6b1 --- /dev/null +++ b/sys-devel/flex/flex-2.6.4-r4.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic libtool multilib-minimal toolchain-funcs + +DESCRIPTION="The Fast Lexical Analyzer" +HOMEPAGE="https://github.com/westes/flex" +SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools-regenerate.patch.xz" + +LICENSE="FLEX" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls static test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-devel/m4" +# We want bison explicitly and not yacc in general, bug #381273 +BDEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) + test? ( sys-devel/bison ) +" + +PATCHES=( + "${FILESDIR}"/${P}-libobjdir.patch + "${FILESDIR}"/${P}-fix-build-with-glibc2.26.patch + + "${WORKDIR}"/${P}-autotools-regenerate.patch +) + +src_prepare() { + default + + # Drop on next release when we can remove ${P}-autotools-regenerate.patch + touch configure.ac aclocal.m4 Makefile.in configure src/config.h.in || die + + # Disable running in the tests/ subdir as it has a bunch of built sources + # that cannot be made conditional (automake limitation). bug #568842 + if ! use test ; then + sed -i \ + -e '/^SUBDIRS =/,/^$/{/tests/d}' \ + Makefile.in || die + fi + + # Prefix always needs this + elibtoolize +} + +src_configure() { + use static && append-ldflags -static + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # Do not install shared libs, #503522 + ECONF_SOURCE="${S}" econf \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" \ + --disable-shared \ + $(use_enable nls) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + emake -C src -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 + emake -C src DESTDIR="${D}" install-libLTLIBRARIES install-includeHEADERS + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc ONEWS + find "${ED}" -name '*.la' -type f -delete || die + rm "${ED}"/usr/share/doc/${PF}/COPYING || die + + dosym flex /usr/bin/lex +} -- cgit v1.2.3