diff options
Diffstat (limited to 'dev-util/ragel')
-rw-r--r-- | dev-util/ragel/Manifest | 3 | ||||
-rw-r--r-- | dev-util/ragel/files/ragel-6.7+gcc-4.7.patch | 178 | ||||
-rw-r--r-- | dev-util/ragel/files/ragel-6.7-cross-compile.patch | 21 | ||||
-rw-r--r-- | dev-util/ragel/metadata.xml | 10 | ||||
-rw-r--r-- | dev-util/ragel/ragel-6.7-r1.ebuild | 50 | ||||
-rw-r--r-- | dev-util/ragel/ragel-6.8.ebuild | 45 | ||||
-rw-r--r-- | dev-util/ragel/ragel-6.9.ebuild | 38 |
7 files changed, 345 insertions, 0 deletions
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest new file mode 100644 index 000000000000..437d9d9311f8 --- /dev/null +++ b/dev-util/ragel/Manifest @@ -0,0 +1,3 @@ +DIST ragel-6.7.tar.gz 1182734 SHA256 46df8e3f117a730f8896061c95ea8e8f53e9789cb053c2eea047833724fd7a30 SHA512 a85c1d5d4fd7d903c823c2ddc8b5f1d5dd5f715f11bc04f10fb78ea5632b3aa33c5b4861f89179fa9d6b4944484216ee93bbd25dd0b5958d2419e434b781b78a WHIRLPOOL 52f1614e16390949fe070df46c9929b5871e35923b38e6c277f0d4688e45f610a16a6635240cea0622892c675aebf092e3f6a9c626684ed1a4af8191ff3c6d6f +DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f71897e3e4ec05c8f398764 SHA512 3c7fa4ca0cfcd5d19e0ff8746ca427f5a1eefb0af09db5d2ee55ced9bcc35c588a5db146dcfdec46b83fb63d94ff9ace117b4cfcb07e2c57aec67a6cbe249458 WHIRLPOOL 540ba0c5a712ae0426982e08e7aa7b1fa1ff33e3d9c2095353939ed2c45e04048ebcdf93292ead8e70abbd8fa230dddbfeea8d485955142d0615ddb94c8a0b9a +DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e diff --git a/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch new file mode 100644 index 000000000000..80eb29a46f05 --- /dev/null +++ b/dev-util/ragel/files/ragel-6.7+gcc-4.7.patch @@ -0,0 +1,178 @@ +From 27454d1e55b2a5cefc3cc1044d036add9ee9a6d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Tue, 22 May 2012 16:25:37 -0700 +Subject: [PATCH] aapl: fix building with gcc-4.7.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Starting with GCC 4.7, you have to explicit methods inherited from +base templates, otherwise it will refuse to build. + +--- + +The URL reported in the README is no longer registered, so I couldn't +find a way to report this to an upstream project. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + aapl/avlcommon.h | 12 ++++++------ + aapl/bstcommon.h | 16 ++++++++-------- + aapl/bubblesort.h | 2 +- + aapl/mergesort.h | 2 +- + 4 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/aapl/avlcommon.h b/aapl/avlcommon.h +index 06983bc..2e3c190 100644 +--- a/aapl/avlcommon.h ++++ b/aapl/avlcommon.h +@@ -881,9 +881,9 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>:: + } + + #ifdef AVL_BASIC +- keyRelation = compare( *element, *curEl ); ++ keyRelation = this->compare( *element, *curEl ); + #else +- keyRelation = compare( element->BASEKEY(getKey()), ++ keyRelation = this->compare( element->BASEKEY(getKey()), + curEl->BASEKEY(getKey()) ); + #endif + +@@ -920,7 +920,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>:: + long keyRelation; + + while (curEl) { +- keyRelation = compare( *element, *curEl ); ++ keyRelation = this->compare( *element, *curEl ); + + /* Do we go left? */ + if ( keyRelation < 0 ) +@@ -969,7 +969,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>:: + return element; + } + +- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); ++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); + + /* Do we go left? */ + if ( keyRelation < 0 ) { +@@ -1023,7 +1023,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>:: + return element; + } + +- keyRelation = compare(key, curEl->getKey()); ++ keyRelation = this->compare(key, curEl->getKey()); + + /* Do we go left? */ + if ( keyRelation < 0 ) { +@@ -1058,7 +1058,7 @@ template <AVLMEL_TEMPDEF> Element *AvlTree<AVLMEL_TEMPUSE>:: + long keyRelation; + + while (curEl) { +- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); ++ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); + + /* Do we go left? */ + if ( keyRelation < 0 ) +diff --git a/aapl/bstcommon.h b/aapl/bstcommon.h +index 888717f..7c53ff3 100644 +--- a/aapl/bstcommon.h ++++ b/aapl/bstcommon.h +@@ -361,7 +361,7 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -373,12 +373,12 @@ template <BST_TEMPL_DEF> bool BstTable<BST_TEMPL_USE>:: + + lower = mid - 1; + while ( lower != lowEnd && +- compare(key, GET_KEY(*lower)) == 0 ) ++ this->compare(key, GET_KEY(*lower)) == 0 ) + lower--; + + upper = mid + 1; + while ( upper != highEnd && +- compare(key, GET_KEY(*upper)) == 0 ) ++ this->compare(key, GET_KEY(*upper)) == 0 ) + upper++; + + low = (Element*)lower + 1; +@@ -419,7 +419,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -457,7 +457,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -508,7 +508,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(key, GET_KEY(*mid)); ++ keyRelation = this->compare(key, GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -603,7 +603,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); ++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +@@ -662,7 +662,7 @@ template <BST_TEMPL_DEF> Element *BstTable<BST_TEMPL_USE>:: + } + + mid = lower + ((upper-lower)>>1); +- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); ++ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); + + if ( keyRelation < 0 ) + upper = mid - 1; +diff --git a/aapl/bubblesort.h b/aapl/bubblesort.h +index bcc2fb6..f0f4ce5 100644 +--- a/aapl/bubblesort.h ++++ b/aapl/bubblesort.h +@@ -72,7 +72,7 @@ template <class T, class Compare> void BubbleSort<T,Compare>:: + changed = false; + for ( long i = 0; i < len-pass; i++ ) { + /* Do we swap pos with the next one? */ +- if ( compare( data[i], data[i+1] ) > 0 ) { ++ if ( this->compare( data[i], data[i+1] ) > 0 ) { + char tmp[sizeof(T)]; + + /* Swap the two items. */ +diff --git a/aapl/mergesort.h b/aapl/mergesort.h +index 68b8426..8cefa73 100644 +--- a/aapl/mergesort.h ++++ b/aapl/mergesort.h +@@ -110,7 +110,7 @@ template< class T, class Compare> void MergeSort<T,Compare>:: + } + else { + /* Both upper and lower left. */ +- if ( compare(*lower, *upper) <= 0 ) ++ if ( this->compare(*lower, *upper) <= 0 ) + memcpy( dest++, lower++, sizeof(T) ); + else + memcpy( dest++, upper++, sizeof(T) ); +-- +1.7.8.6 + diff --git a/dev-util/ragel/files/ragel-6.7-cross-compile.patch b/dev-util/ragel/files/ragel-6.7-cross-compile.patch new file mode 100644 index 000000000000..e953a1aeeeef --- /dev/null +++ b/dev-util/ragel/files/ragel-6.7-cross-compile.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/473970 + +already sent upstream + +patch by Jungshik Shin + +--- ragel-6.7/configure.in ++++ ragel-6.7/configure.in +@@ -27,9 +27,9 @@ + + dnl Choose defaults for the build_parsers and build_manual vars. If the dist + dnl file is present in the root then default to no, otherwise go for it. +-AC_CHECK_FILES( $srcdir/DIST, +- [ . $srcdir/DIST; ], +- [ build_parsers=yes; build_manual=yes; ] ) ++ ++AS_IF([test -r $srcdir/DIST], [. $srcdir/DIST], [build_parsers=yes; ++ build_manual=yes]) + + dnl + dnl Enable arg to explicitly control the building of the manual diff --git a/dev-util/ragel/metadata.xml b/dev-util/ragel/metadata.xml new file mode 100644 index 000000000000..2ba6e4da9d2c --- /dev/null +++ b/dev-util/ragel/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>lu_zero@gentoo.org</email> + </maintainer> + <maintainer> + <email>flameeyes@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/dev-util/ragel/ragel-6.7-r1.ebuild b/dev-util/ragel/ragel-6.7-r1.ebuild new file mode 100644 index 000000000000..1ca0a9eff99a --- /dev/null +++ b/dev-util/ragel/ragel-6.7-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit eutils autotools + +DESCRIPTION="Compiles finite state machines from regular languages into executable code" +HOMEPAGE="http://www.complang.org/ragel/" +SRC_URI="http://www.complang.org/ragel/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="vim-syntax" + +DEPEND="" +RDEPEND="" + +# We need to get the txl language in Portage to have the tests :( +RESTRICT=test + +DOCS=( ChangeLog CREDITS README TODO ) + +src_prepare() { + epatch "${FILESDIR}"/${P}+gcc-4.7.patch + epatch "${FILESDIR}"/${P}-cross-compile.patch #473970 + sed -i -e '/CXXFLAGS/d' configure.in || die + + eautoreconf +} + +src_configure() { + econf --docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_test() { + cd "${S}"/test + ./runtests.in || die +} + +src_install() { + default + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins ragel.vim + fi +} diff --git a/dev-util/ragel/ragel-6.8.ebuild b/dev-util/ragel/ragel-6.8.ebuild new file mode 100644 index 000000000000..7b12d5241299 --- /dev/null +++ b/dev-util/ragel/ragel-6.8.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools autotools-utils + +DESCRIPTION="Compiles finite state machines from regular languages into executable code" +HOMEPAGE="http://www.complang.org/ragel/" +SRC_URI="http://www.complang.org/ragel/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="vim-syntax" + +DEPEND="" +RDEPEND="" + +# We need to get the txl language in Portage to have the tests :( +RESTRICT=test + +DOCS=( ChangeLog CREDITS README TODO ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-6.7-cross-compile.patch #473970 + sed -i -e '/CXXFLAGS/d' configure.in || die + + eautoreconf +} + +src_test() { + cd "${S}"/test + ./runtests.in || die +} + +src_install() { + autotools-utils_src_install + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins ragel.vim + fi +} diff --git a/dev-util/ragel/ragel-6.9.ebuild b/dev-util/ragel/ragel-6.9.ebuild new file mode 100644 index 000000000000..2f153c15a807 --- /dev/null +++ b/dev-util/ragel/ragel-6.9.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools autotools-utils + +DESCRIPTION="Compiles finite state machines from regular languages into executable code" +HOMEPAGE="http://www.colm.net/open-source/ragel/" +SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="vim-syntax" + +DEPEND="" +RDEPEND="" + +# We need to get the txl language in Portage to have the tests :( +RESTRICT=test + +DOCS=( ChangeLog CREDITS README TODO ) + +src_test() { + cd "${S}"/test + ./runtests.in || die +} + +src_install() { + autotools-utils_src_install + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins ragel.vim + fi +} |