* [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/
@ 2015-11-23 11:02 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2015-11-23 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 2950652b36f17fcd573888d2a5cfe999afd4023d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 11:01:27 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 11:02:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2950652b
sys-devel/flex: Removed old.
Package-Manager: portage-2.2.25
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-devel/flex/Manifest | 4 -
sys-devel/flex/files/flex-2.5.33-pic.patch | 12 ---
sys-devel/flex/files/flex-2.5.34-isatty.patch | 53 ----------
sys-devel/flex/files/flex-2.5.35-gcc44.patch | 13 ---
.../flex/files/flex-2.5.35-saneautotools.patch | 77 --------------
sys-devel/flex/files/flex-2.5.37-proto.patch | 27 -----
sys-devel/flex/files/flex-2.5.37-tests.patch | 113 ---------------------
sys-devel/flex/flex-2.5.35.ebuild | 43 --------
sys-devel/flex/flex-2.5.35_p10.ebuild | 50 ---------
sys-devel/flex/flex-2.5.37.ebuild | 51 ----------
sys-devel/flex/flex-2.5.38-r1.ebuild | 40 --------
sys-devel/flex/flex-2.5.39.ebuild | 40 --------
12 files changed, 523 deletions(-)
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index 1c92cb9..c9d385a 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,6 +1,2 @@
-DIST flex-2.5.35.tar.bz2 1256501 SHA256 0becbd4b2b36b99c67f8c22ab98f7f80c9860aec70f0350a0018f29a88704e7b SHA512 aa5aebbc7ccaa4697d7f0cfa3ba899dd3b327bc8551ba341c26bece7f9044951d0532e3ebf6ec63760204b4ff805f9f957d064e9a213ef8aac428e565de31343 WHIRLPOOL 5cb46a2cec84b1c6d25e22a1e4a6ac1a5100fcf32a488918f8bfe9236339ff2aac7f2dc35a590417fe1609d89511ab47de4ba4f7db17251b7408ea0f18e6894d
-DIST flex-2.5.37.tar.bz2 1303313 SHA256 17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a SHA512 1f34285953a7f058e6a2dddc305fc82cfcaaa451d6d7777da17bf9cccbe4a08e480c8c28951fa5d2920e7c7adc40ccd0e51191b363c9a3c4137db5ded1cbbc2a WHIRLPOOL ee5a4dde9b373c57248df261a53ea951e12ccb3e6f2e6344c56c2d8393511389560b4843660edf2a0929e2ed6fc46ab8d832e36a8ee5fe4317ce85ccea14d6ca
-DIST flex-2.5.38.tar.xz 1349536 SHA256 3621e0217f6c2088411e5b6fd9f2d83f2fbf014dcdf24e80680f66e6dd93729c SHA512 98d4a722dcb23c0ebca997ef28ae40cebbe65e24adf8700ac9127404d1bcd0e30638d296d639afb092b65b4767f35f5ee0b0bf229ac040ef8029a04694d6d4c2 WHIRLPOOL 56e282bc56ef825a953d1211602de1a243164d09b9b794debffbd7c56830572d24910b20b44b8749173c9bc008bae99406320a5042a4054290b69320a1df3aed
DIST flex-2.5.39.tar.xz 1347436 SHA256 c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec WHIRLPOOL 6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
DIST flex-2.6.0.tar.xz 1369552 SHA256 d39b15a856906997ced252d76e9bfe2425d7503c6ed811669665627b248e4c73 SHA512 9cd48aa79ce70814902745d6e67f677bcc67f23dcc46ebb5f2963efac0d8f6f6c10ee87369d2d7557d29e390a3502dd99246db0fd2e096b9e7bb6e16d51d3abe WHIRLPOOL e44cab6763699a9d4d8af29b8c45c2e5b203a643834730f35e5745d145e5b3a4605506da209aa8e4e087e2e8872926261d0d2f29751d616cc77df36021d753b2
-DIST flex_2.5.35-10.diff.gz 41011 SHA256 1d57a2a73ae7b7d4bd95a7c3f5801ab39c0b2b55b5d838782da8d3801cc1a3b9 SHA512 ecb64cb5d27da0c82c99958640ee5f09afff4096a93817f68f3333f86a838ab4f21daf959bfc650b89e0d52a827c55265cb4c4a4f9efab050a8f91dd82258820 WHIRLPOOL 4fa27c32d81c766e657645816e4a24e46b126e5eb38ad38fc66a7d3d3e3100b76ec694898dcbcc486687f4ec9d89d517a670f7ca20de22586d2f0b56a7fe50cd
diff --git a/sys-devel/flex/files/flex-2.5.33-pic.patch b/sys-devel/flex/files/flex-2.5.33-pic.patch
deleted file mode 100644
index 88ac8b3..0000000
--- a/sys-devel/flex/files/flex-2.5.33-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in 2007-02-06 12:27:32.000000000 +0100
-+++ Makefile.in.new 2007-02-06 12:29:50.000000000 +0100
-@@ -993,7 +993,9 @@
- ecs.o: ecs.c flexdef.h flexint.h
- gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h
- libmain.o: libmain.c
-+ $(COMPILE) -fPIC -DPIC -o libmain.o -c libmain.c
- libyywrap.o: libyywrap.c
-+ $(COMPILE) -fPIC -DPIC -o libyywrap.o -c libyywrap.c
- main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
- tables.h tables_shared.h
- misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h
diff --git a/sys-devel/flex/files/flex-2.5.34-isatty.patch b/sys-devel/flex/files/flex-2.5.34-isatty.patch
deleted file mode 100644
index b397433..0000000
--- a/sys-devel/flex/files/flex-2.5.34-isatty.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Declare the isatty prototype all the time ... otherwise packages like
-doxygen and ttmkfdir fail to build.
-
-http://bugs.gentoo.org/119598
-
---- flex/scan.c
-+++ flex/scan.c
-@@ -4179,9 +4179,19 @@
- yyfree((void *) b );
- }
-
-+#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */
--#ifndef __cplusplus
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#ifdef __THROW /* this is a gnuism */
-+extern int isatty (int ) __THROW;
-+#else
- extern int isatty (int );
-+#endif
--#endif /* __cplusplus */
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-
- /* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
---- flex/skel.c
-+++ flex/skel.c
-@@ -2183,9 +2183,19 @@
- "[[",
- " m4_ifdef( [[M4_YY_NEVER_INTERACTIVE]],,",
- " [[",
-+ "#ifndef _UNISTD_H /* assume unistd.h has isatty() for us */",
-- "#ifndef __cplusplus",
-+ "#ifdef __cplusplus",
-+ "extern \"C\" {",
-+ "#endif",
-+ "#ifdef __THROW /* this is a gnuism */",
-+ "extern int isatty M4_YY_PARAMS( int ) __THROW;",
-+ "#else",
- "extern int isatty M4_YY_PARAMS( int );",
-+ "#endif",
-- "#endif /* __cplusplus */",
-+ "#ifdef __cplusplus",
-+ "}",
-+ "#endif",
-+ "#endif",
- " ]])",
- "]])",
- "%endif",
diff --git a/sys-devel/flex/files/flex-2.5.35-gcc44.patch b/sys-devel/flex/files/flex-2.5.35-gcc44.patch
deleted file mode 100644
index 69045be..0000000
--- a/sys-devel/flex/files/flex-2.5.35-gcc44.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=2178663&group_id=97492&atid=618177
-
-diff -Naurp flex-2.5.35-orig/skel.c flex-2.5.35/skel.c
---- flex-2.5.35-orig/skel.c 2009-03-25 22:21:16.000000000 -0600
-+++ flex-2.5.35/skel.c 2009-03-25 22:22:22.000000000 -0600
-@@ -286,6 +286,7 @@ const char *skel[] = {
- "#include <errno.h>",
- "#include <cstdlib>",
- "#include <cstring>",
-+ "#include <cstdio>",
- "/* end standard C++ headers. */",
- "%endif",
- "",
diff --git a/sys-devel/flex/files/flex-2.5.35-saneautotools.patch b/sys-devel/flex/files/flex-2.5.35-saneautotools.patch
deleted file mode 100644
index fd8487a..0000000
--- a/sys-devel/flex/files/flex-2.5.35-saneautotools.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: flex-2.5.35/configure.in
-===================================================================
---- flex-2.5.35.orig/configure.in
-+++ flex-2.5.35/configure.in
-@@ -39,6 +39,7 @@ AM_GNU_GETTEXT_VERSION(0.12)
- AC_PROG_YACC
- AM_PROG_LEX
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_PROG_CXX
- AC_PROG_LN_S
- AC_PROG_RANLIB
-@@ -103,13 +104,6 @@ AC_HEADER_STDBOOL
- AC_C_CONST
- AC_TYPE_SIZE_T
-
--# Checks for library functions.
--
--AC_FUNC_FORK
--AC_FUNC_MALLOC
--AC_FUNC_REALLOC
--AC_CHECK_FUNCS([dup2 isascii memset pow regcomp setlocale strchr strtol])
--
- AC_CONFIG_FILES(
- Makefile
- doc/Makefile
-Index: flex-2.5.35/Makefile.am
-===================================================================
---- flex-2.5.35.orig/Makefile.am
-+++ flex-2.5.35/Makefile.am
-@@ -127,33 +127,6 @@ LIBS = @LIBINTL@ @LIBS@
- skel.c: flex.skl mkskel.sh flexint.h tables_shared.h
- sed 's/m4_/m4postproc_/g; s/m4preproc_/m4_/g' $(srcdir)/flex.skl | $(m4) -P -DFLEX_MAJOR_VERSION=`echo $(VERSION)|cut -f 1 -d .` -DFLEX_MINOR_VERSION=`echo $(VERSION)|cut -f 2 -d .` -DFLEX_SUBMINOR_VERSION=`echo $(VERSION)|cut -f 3 -d .` | sed 's/m4postproc_/m4_/g' | $(SHELL) $(srcdir)/mkskel.sh >skel.c
-
--# Explicitly describe dependencies.
--# You can recreate this with `gcc -I. -MM *.c'
--buf.o: buf.c flexdef.h flexint.h
--ccl.o: ccl.c flexdef.h flexint.h
--dfa.o: dfa.c flexdef.h flexint.h tables.h tables_shared.h
--ecs.o: ecs.c flexdef.h flexint.h
--scanflags.o: scanflags.c flexdef.h flexint.h
--gen.o: gen.c flexdef.h flexint.h tables.h tables_shared.h
--libmain.o: libmain.c
--libyywrap.o: libyywrap.c
--main.o: main.c flexdef.h flexint.h version.h options.h scanopt.h \
-- tables.h tables_shared.h
--misc.o: misc.c flexdef.h flexint.h tables.h tables_shared.h
--nfa.o: nfa.c flexdef.h flexint.h
--options.o: options.c options.h scanopt.h flexdef.h flexint.h
--parse.o: parse.c flexdef.h flexint.h tables.h tables_shared.h
--scan.o: scan.c flexdef.h flexint.h parse.h
--scanopt.o: scanopt.c flexdef.h flexint.h scanopt.h
--skel.o: skel.c flexdef.h flexint.h
--sym.o: sym.c flexdef.h flexint.h
--tables.o: tables.c flexdef.h flexint.h tables.h tables_shared.h
--tables_shared.o: tables_shared.c flexdef.h flexint.h tables.h \
-- tables_shared.h
--tblcmp.o: tblcmp.c flexdef.h flexint.h
--yylex.o: yylex.c flexdef.h flexint.h parse.h
--filter.o: filter.c flexdef.h flexint.h
--
- # Create the ChangeLog, but only if we're inside a cvs working directory
-
- ChangeLog: $(srcdir)/tools/cvsauthors $(srcdir)/tools/cvs2cl.pl
-Index: flex-2.5.35/tests/test-pthread/Makefile.am
-===================================================================
---- flex-2.5.35.orig/tests/test-pthread/Makefile.am
-+++ flex-2.5.35/tests/test-pthread/Makefile.am
-@@ -27,7 +27,7 @@ CLEANFILES = scanner.c scanner.h parser.
- OBJS = scanner.o # parser.o
-
- AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir) -I$(top_builddir)
--LDFLAGS = -lpthread
-+LOADLIBES = -lpthread
- #LFLAGS = --header="scanner.h"
- #YFLAGS = --defines --output=parser.c
-
diff --git a/sys-devel/flex/files/flex-2.5.37-proto.patch b/sys-devel/flex/files/flex-2.5.37-proto.patch
deleted file mode 100644
index 5d3c30f..0000000
--- a/sys-devel/flex/files/flex-2.5.37-proto.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0f9eb0b8455f843daebf0f3dababeee7f3cde48b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 4 Aug 2012 15:46:38 -0400
-Subject: [PATCH] add prototype for lerrsf_fatal
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- flexdef.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/flexdef.h b/flexdef.h
-index 0e81410..046dd9a 100644
---- a/flexdef.h
-+++ b/flexdef.h
-@@ -908,6 +908,9 @@ extern void lerrif PROTO ((const char *, int));
- /* Report an error message formatted with one string argument. */
- extern void lerrsf PROTO ((const char *, const char *));
-
-+/* Like lerrsf, but also exit after displaying message. */
-+extern void lerrsf_fatal PROTO ((const char *, const char *));
-+
- /* Spit out a "#line" statement. */
- extern void line_directive_out PROTO ((FILE *, int));
-
---
-1.7.9.7
-
diff --git a/sys-devel/flex/files/flex-2.5.37-tests.patch b/sys-devel/flex/files/flex-2.5.37-tests.patch
deleted file mode 100644
index 56d441a..0000000
--- a/sys-devel/flex/files/flex-2.5.37-tests.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 095b0bf0a730d46d301c0e2fb2e7af40caeb2c9b Mon Sep 17 00:00:00 2001
-From: Elias Pipping <pipping@users.sourceforge.net>
-Date: Mon, 6 Aug 2012 15:13:23 -0400
-Subject: [PATCH] Fix two tests to pass under bison 2.6
-
-Given that bison is moving forward with the %parse-param instead of
-YYPARSE_PARAM syntax, it makes sense to switch over to using the new style
-declaration. In particular, this means that flex scanners that use bison
-features will now require bison 2.6 or higher.
-
-Signed-off-by: Will Estes <westes575@gmail.com>
----
- tests/test-bison-yylloc/main.c | 2 --
- tests/test-bison-yylloc/parser.y | 6 +++---
- tests/test-bison-yylval/main.c | 2 --
- tests/test-bison-yylval/parser.y | 6 ++----
- 4 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/tests/test-bison-yylloc/main.c b/tests/test-bison-yylloc/main.c
-index 082c88c..24568a9 100644
---- a/tests/test-bison-yylloc/main.c
-+++ b/tests/test-bison-yylloc/main.c
-@@ -24,8 +24,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
- yyscan_t scanner;
-diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y
-index aaee976..e8f4e56 100644
---- a/tests/test-bison-yylloc/parser.y
-+++ b/tests/test-bison-yylloc/parser.y
-@@ -21,6 +21,8 @@
- * PURPOSE.
- */
-
-+%parse-param { void* scanner }
-+
- /*
- How to compile:
- bison --defines --output-file="parser.c" --name-prefix="test" parser.y
-@@ -32,10 +34,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM scanner
-
--int yyerror(char* msg);
- extern int testget_lineno(void*);
-
-
-@@ -89,7 +89,7 @@ line:
-
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
- fprintf(stderr,"%s\n",msg);
- return 0;
- }
-diff --git a/tests/test-bison-yylval/main.c b/tests/test-bison-yylval/main.c
-index 165e672..30c4314 100644
---- a/tests/test-bison-yylval/main.c
-+++ b/tests/test-bison-yylval/main.c
-@@ -24,8 +24,6 @@
- #include "parser.h"
- #include "scanner.h"
-
--extern int testparse(yyscan_t);
--
- int main ( int argc, char** argv )
- {
- yyscan_t scanner;
-diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y
-index 77bac87..0ffdb89 100644
---- a/tests/test-bison-yylval/parser.y
-+++ b/tests/test-bison-yylval/parser.y
-@@ -25,6 +25,7 @@
- How to compile:
- bison --defines --output-file="parser.c" --name-prefix="test" parser.y
- */
-+%parse-param { void* scanner }
- %{
- #include <stdio.h>
- #include <stdlib.h>
-@@ -32,11 +33,8 @@
- #include "config.h"
-
- #define YYERROR_VERBOSE 1
--#define YYPARSE_PARAM scanner
- #define YYLEX_PARAM scanner
-
--int yyerror(char* msg);
--
-
- /* A dummy function. A check against seg-faults in yylval->str. */
- int process_text(char* s) {
-@@ -76,7 +74,7 @@ starttag: LT TAGNAME GT { process_text($2); free($2);} ;
- endtag: LTSLASH TAGNAME GT { process_text($2);free($2);} ;
- %%
-
--int yyerror(char* msg) {
-+int yyerror(void* scanner, char* msg) {
- fprintf(stderr,"%s\n",msg);
- return 0;
- }
---
-1.7.9.7
-
diff --git a/sys-devel/flex/flex-2.5.35.ebuild b/sys-devel/flex/flex-2.5.35.ebuild
deleted file mode 100644
index 8477cb9..0000000
--- a/sys-devel/flex/flex-2.5.35.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils flag-o-matic
-
-#DEB_VER=36
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.bz2"
-# mirror://debian/pool/main/f/flex/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls static test"
-
-RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bison )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- [[ -n ${DEB_VER} ]] && epatch "${WORKDIR}"/${PN}_${PV}-${DEB_VER}.diff
- epatch "${FILESDIR}"/${PN}-2.5.34-isatty.patch #119598
- epatch "${FILESDIR}"/${PN}-2.5.33-pic.patch
- epatch "${FILESDIR}"/${PN}-2.5.35-gcc44.patch
- sed -i 's:^LDFLAGS:LOADLIBES:' tests/test-pthread/Makefile.in #262989
-}
-
-src_compile() {
- use static && append-ldflags -static
- econf $(use_enable nls) || die
- emake || die
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
- dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.35_p10.ebuild b/sys-devel/flex/flex-2.5.35_p10.ebuild
deleted file mode 100644
index 2b58515..0000000
--- a/sys-devel/flex/flex-2.5.35_p10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-if [[ ${PV} == *_p* ]]; then
- DEB_DIFF=${PN}_${PV/_p/-}
-fi
-
-MY_P=${P%_p*}
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${MY_P}.tar.bz2
- ${DEB_DIFF:+mirror://debian/pool/main/f/flex/${DEB_DIFF}.diff.gz}"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="nls static test"
-
-# We want bison explicitly and not yacc in general #381273
-RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bison )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- [[ -n ${DEB_DIFF} ]] && epatch "${WORKDIR}"/${DEB_DIFF}.diff
- epatch "${FILESDIR}"/${PN}-2.5.35-gcc44.patch
- epatch "${FILESDIR}"/${PN}-2.5.35-saneautotools.patch
-
- eautoreconf
-}
-
-src_configure() {
- use static && append-ldflags -static
- econf $(use_enable nls)
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO || die
- dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.37.ebuild b/sys-devel/flex/flex-2.5.37.ebuild
deleted file mode 100644
index dc37f63..0000000
--- a/sys-devel/flex/flex-2.5.37.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == *_p* ]] ; then
- DEB_DIFF=${PN}_${PV/_p/-}
-fi
-MY_P=${P%_p*}
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${MY_P}.tar.bz2
- ${DEB_DIFF:+mirror://debian/pool/main/f/flex/${DEB_DIFF}.diff.gz}"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="nls static test"
-
-# We want bison explicitly and not yacc in general #381273
-RDEPEND="sys-devel/m4"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- test? ( sys-devel/bison )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- [[ -n ${DEB_DIFF} ]] && epatch "${WORKDIR}"/${DEB_DIFF}.diff
- epatch "${FILESDIR}"/${P}-proto.patch
- epatch "${FILESDIR}"/${P}-tests.patch #429954
- sed -i "/^AR =/s:=.*:= $(tc-getAR):" Makefile.in || die #444086
-}
-
-src_configure() {
- use static && append-ldflags -static
- econf \
- $(use_enable nls) \
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- rm "${ED}"/usr/share/doc/${PF}/{COPYING,flex.pdf} || die
- dodoc AUTHORS ChangeLog NEWS ONEWS README* THANKS TODO
- dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.38-r1.ebuild b/sys-devel/flex/flex-2.5.38-r1.ebuild
deleted file mode 100644
index 7faf421..0000000
--- a/sys-devel/flex/flex-2.5.38-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 )"
-
-src_configure() {
- use static && append-ldflags -static
- # Do not install shared libs #503522
- econf \
- --disable-shared \
- $(use_enable nls) \
- --docdir='$(datarootdir)/doc/'${PF}
-}
-
-src_install() {
- default
- dodoc ONEWS
- find "${ED}" -name '*.la' -delete
- rm "${ED}"/usr/share/doc/${PF}/{COPYING,flex.pdf} || die
- dosym flex /usr/bin/lex
-}
diff --git a/sys-devel/flex/flex-2.5.39.ebuild b/sys-devel/flex/flex-2.5.39.ebuild
deleted file mode 100644
index 7faf421..0000000
--- a/sys-devel/flex/flex-2.5.39.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit flag-o-matic
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 )"
-
-src_configure() {
- use static && append-ldflags -static
- # Do not install shared libs #503522
- econf \
- --disable-shared \
- $(use_enable nls) \
- --docdir='$(datarootdir)/doc/'${PF}
-}
-
-src_install() {
- default
- dodoc ONEWS
- find "${ED}" -name '*.la' -delete
- rm "${ED}"/usr/share/doc/${PF}/{COPYING,flex.pdf} || die
- dosym flex /usr/bin/lex
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/
@ 2015-12-13 4:45 Mike Frysinger
0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-12-13 4:45 UTC (permalink / raw
To: gentoo-commits
commit: 775dcc66689e18fe7c037b59a4b1b7394742a008
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 04:39:33 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 04:45:46 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775dcc66
sys-devel/flex: fix tests #567332
.../flex/files/flex-2.6.0-out-of-tree-build.patch | 16 ++++
.../flex/files/flex-2.6.0-out-of-tree-test.patch | 90 ++++++++++++++++++++++
sys-devel/flex/flex-2.6.0.ebuild | 5 ++
3 files changed, 111 insertions(+)
diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
new file mode 100644
index 0000000..36c69f2
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/567332
+
+this is a snippet taken from the upstream commit:
+09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ tests.
+
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -35,6 +35,8 @@
+ # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ # PURPOSE.
+
++AM_CPPFLAGS = -I$(top_srcdir)/src
++
+ VPATH = @srcdir@
+ am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
new file mode 100644
index 0000000..fafa085
--- /dev/null
+++ b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/567332
+https://github.com/westes/flex/pull/39
+
+From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 12 Dec 2015 23:28:43 -0500
+Subject: [PATCH] tests: fix paths to input files
+
+The current test wrapper works only when the inputs are specified using
+relative paths. If they're specified with absolute paths, the driver
+fails to detect the inputs because it always prepends the input dir name
+which itself is a relative path:
+$ cd tests
+$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
+<fails to open inputs>
+
+This normally doesn't show up because people run `./configure` or, for
+out of tree builds, `../configure`. But if you happen to run configure
+with an absolute path, then automake tends to generate absolute paths
+as well leading to test failures.
+
+Fix all of this by dropping the implicit input directory prepending.
+In practice, it doesn't even make sense:
+- INPUT_NAME is often a list of files, not just a single one
+- the input directory is used to find the testname tables which are
+ usually generated, so it's impossible to use files from both source
+ and build directories
+- most of the time, the full/correct path is already specified
+---
+ tests/Makefile.am | 4 ++--
+ tests/testwrapper.sh | 10 +++++-----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cc9c178..6d1d9fe 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_LOG_FLAGS = -d $(srcdir) -r
+ REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
++AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
+ TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
+ DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+@@ -437,7 +437,7 @@ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sert
+ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests)
+ tableopts_c := $(addsuffix .c,$(tableopts_tests))
+ OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh
+-AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r
++AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r
+ SER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+ AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
+ VER_LOG_COMPILER = $(srcdir)/testwrapper.sh
+diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh
+index 30127b5..051e20b 100755
+--- a/tests/testwrapper.sh
++++ b/tests/testwrapper.sh
+@@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do
+
+ TESTNAME="${!OPTIND}"
+
+-INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt}
++INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt}
+
+ if [ "$DO_COMPARISON" -eq "1" ] ; then
+- test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < $INPUT_DIRECTORY/$INPUT_NAME`
++ test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME`
+ exit $?
+ fi
+
+@@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then
+ exit $?
+ fi
+
+-if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then
++if [ -f ${INPUT_NAME} ] ; then
+ if [ $USE_REDIRECT == 1 ] ; then
+- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_DIRECTORY/$INPUT_NAME
++ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_NAME
+ else
+- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_DIRECTORY/$INPUT_NAME
++ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_NAME
+ fi
+ else
+ $TESTNAME
+--
+2.6.2
+
diff --git a/sys-devel/flex/flex-2.6.0.ebuild b/sys-devel/flex/flex-2.6.0.ebuild
index aa83cdc..b603320 100644
--- a/sys-devel/flex/flex-2.6.0.ebuild
+++ b/sys-devel/flex/flex-2.6.0.ebuild
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
test? ( sys-devel/bison )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-out-of-tree-build.patch #567332
+ epatch "${FILESDIR}"/${P}-out-of-tree-test.patch #567332
+}
+
src_configure() {
use static && append-ldflags -static
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/
@ 2017-01-11 13:15 Lars Wendler
0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2017-01-11 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 920eefba5481eef110406a2b6859c4edd0b4c48e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 13:14:48 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 13:14:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=920eefba
sys-devel/flex: Security cleanup (bug #589820).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-devel/flex/Manifest | 1 -
.../flex/files/flex-2.6.0-out-of-tree-build.patch | 16 ----
.../flex/files/flex-2.6.0-out-of-tree-test.patch | 90 ----------------------
sys-devel/flex/flex-2.5.39-r1.ebuild | 66 ----------------
4 files changed, 173 deletions(-)
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest
index a95665e..7e63a4e 100644
--- a/sys-devel/flex/Manifest
+++ b/sys-devel/flex/Manifest
@@ -1,3 +1,2 @@
-DIST flex-2.5.39.tar.xz 1347436 SHA256 c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8 SHA512 488bfd40043851d6f069333090081cc09c8754cd098dd24655ea705dd381efc4e88080fe8060fe6c790f450695f1b209f7115b154723c203f43b00f4ccfa5bec WHIRLPOOL 6f46ed30ca3a3ac6449170171205031ab821a0d78aaed36c7faf59c12724f8787092ba1a3ea846e359791476da7f9bb007155caac60e696326445c75c5d70dd5
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
diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
deleted file mode 100644
index 36c69f2..00000000
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://bugs.gentoo.org/567332
-
-this is a snippet taken from the upstream commit:
-09eae589d3954a1e1206aa01108ee75ef57776da Used in-tree header file for c++ tests.
-
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,6 +35,8 @@
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- # PURPOSE.
-
-+AM_CPPFLAGS = -I$(top_srcdir)/src
-+
- VPATH = @srcdir@
- am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
diff --git a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch b/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
deleted file mode 100644
index fafa085..00000000
--- a/sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/567332
-https://github.com/westes/flex/pull/39
-
-From e7761df66e8412093d0c1c25ce24e3a912076564 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 12 Dec 2015 23:28:43 -0500
-Subject: [PATCH] tests: fix paths to input files
-
-The current test wrapper works only when the inputs are specified using
-relative paths. If they're specified with absolute paths, the driver
-fails to detect the inputs because it always prepends the input dir name
-which itself is a relative path:
-$ cd tests
-$ ./testwrapper.sh -d . -i $PWD/reject.txt -t ./reject_ver.table
-<fails to open inputs>
-
-This normally doesn't show up because people run `./configure` or, for
-out of tree builds, `../configure`. But if you happen to run configure
-with an absolute path, then automake tends to generate absolute paths
-as well leading to test failures.
-
-Fix all of this by dropping the implicit input directory prepending.
-In practice, it doesn't even make sense:
-- INPUT_NAME is often a list of files, not just a single one
-- the input directory is used to find the testname tables which are
- usually generated, so it's impossible to use files from both source
- and build directories
-- most of the time, the full/correct path is already specified
----
- tests/Makefile.am | 4 ++--
- tests/testwrapper.sh | 10 +++++-----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index cc9c178..6d1d9fe 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -35,7 +35,7 @@ LOG_COMPILER = $(srcdir)/testwrapper.sh
- LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_LOG_FLAGS = -d $(srcdir) -r
- REJECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
--AM_REJECT_LOG_FLAGS = -d $(srcdir) -i reject.txt -r
-+AM_REJECT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/reject.txt -r
- TABLE_LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_TABLE_LOG_FLAGS = -d $(builddir) -i $(srcdir)/reject.txt -t
- DIRECT_LOG_COMPILER = $(srcdir)/testwrapper.sh
-@@ -437,7 +437,7 @@ tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sert
- tableopts_tests := $(tableopts_opttests) $(tableopts_vertests) $(tableopts_sertests)
- tableopts_c := $(addsuffix .c,$(tableopts_tests))
- OPT_LOG_COMPILER = $(srcdir)/testwrapper.sh
--AM_OPT_LOG_FLAGS = -d $(srcdir) -i tableopts.txt -r
-+AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r
- SER_LOG_COMPILER = $(srcdir)/testwrapper.sh
- AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
- VER_LOG_COMPILER = $(srcdir)/testwrapper.sh
-diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh
-index 30127b5..051e20b 100755
---- a/tests/testwrapper.sh
-+++ b/tests/testwrapper.sh
-@@ -30,10 +30,10 @@ while getopts :d:i:rt1 OPTION ; do
-
- TESTNAME="${!OPTIND}"
-
--INPUT_NAME=${INPUT_NAME:-`basename $TESTNAME`.txt}
-+INPUT_NAME=${INPUT_NAME:-$INPUT_DIRECTORY/`basename $TESTNAME`.txt}
-
- if [ "$DO_COMPARISON" -eq "1" ] ; then
-- test `$TESTNAME 1 < $INPUT_DIRECTORY/$INPUT_NAME` -eq `$TESTNAME < $INPUT_DIRECTORY/$INPUT_NAME`
-+ test `$TESTNAME 1 < $INPUT_NAME` -eq `$TESTNAME < $INPUT_NAME`
- exit $?
- fi
-
-@@ -42,11 +42,11 @@ if [ $INPUT_COUNT -gt 1 ] ; then
- exit $?
- fi
-
--if [ -f ${INPUT_DIRECTORY}/${INPUT_NAME} ] ; then
-+if [ -f ${INPUT_NAME} ] ; then
- if [ $USE_REDIRECT == 1 ] ; then
-- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_DIRECTORY/$INPUT_NAME
-+ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} < $INPUT_NAME
- else
-- $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_DIRECTORY/$INPUT_NAME
-+ $TESTNAME ${USE_TABLES:+${INPUT_DIRECTORY}/${TESTNAME}.tables} $INPUT_NAME
- fi
- else
- $TESTNAME
---
-2.6.2
-
diff --git a/sys-devel/flex/flex-2.5.39-r1.ebuild b/sys-devel/flex/flex-2.5.39-r1.ebuild
deleted file mode 100644
index ae1708c..00000000
--- a/sys-devel/flex/flex-2.5.39-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils flag-o-matic multilib-minimal
-
-DESCRIPTION="The Fast Lexical Analyzer"
-HOMEPAGE="http://flex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flex/${P}.tar.xz"
-
-LICENSE="FLEX"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-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 )"
-
-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
- 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
- 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,flex.pdf} || die
- dosym flex /usr/bin/lex
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/
@ 2022-12-28 0:33 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-12-28 0:33 UTC (permalink / raw
To: gentoo-commits
commit: a288f455ec1f527b20e3c90ae4b3662413bf68fe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 23:54:34 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 00:32:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a288f455
sys-devel/flex: drop 2.6.4-r2, 2.6.4-r4
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../flex-2.6.4-fix-build-with-glibc2.6+.patch | 767 ---------------------
sys-devel/flex/flex-2.6.4-r2.ebuild | 94 ---
sys-devel/flex/flex-2.6.4-r4.ebuild | 93 ---
3 files changed, 954 deletions(-)
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
deleted file mode 100644
index 328b57524565..000000000000
--- a/sys-devel/flex/files/flex-2.6.4-fix-build-with-glibc2.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
-
diff --git a/sys-devel/flex/flex-2.6.4-r2.ebuild b/sys-devel/flex/flex-2.6.4-r2.ebuild
deleted file mode 100644
index 81df61f3d33f..000000000000
--- a/sys-devel/flex/flex-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,94 +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
-)
-
-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
deleted file mode 100644
index d588701fdf44..000000000000
--- a/sys-devel/flex/flex-2.6.4-r4.ebuild
+++ /dev/null
@@ -1,93 +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"
-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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-12-28 0:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-28 0:33 [gentoo-commits] repo/gentoo:master commit in: sys-devel/flex/files/, sys-devel/flex/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2017-01-11 13:15 Lars Wendler
2015-12-13 4:45 Mike Frysinger
2015-11-23 11:02 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox