diff options
| -rw-r--r-- | sys-devel/flex/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/flex/files/flex-2.6.0-out-of-tree-build.patch | 16 | ||||
| -rw-r--r-- | sys-devel/flex/files/flex-2.6.0-out-of-tree-test.patch | 90 | ||||
| -rw-r--r-- | sys-devel/flex/flex-2.5.39-r1.ebuild | 66 |
4 files changed, 0 insertions, 173 deletions
diff --git a/sys-devel/flex/Manifest b/sys-devel/flex/Manifest index a95665ed231c..7e63a4ea6ff8 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 36c69f235f77..000000000000 --- 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 fafa085baf20..000000000000 --- 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 ae1708c435ca..000000000000 --- 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 -} |