diff options
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/maude/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/maude/Manifest | 15 | ||||
| -rw-r--r-- | dev-lang/maude/files/maude-2.3.0-gcc43.patch | 107 | ||||
| -rw-r--r-- | dev-lang/maude/maude-2.3.0.ebuild | 11 |
4 files changed, 135 insertions, 6 deletions
diff --git a/dev-lang/maude/ChangeLog b/dev-lang/maude/ChangeLog index fcba333373d1..8c9cc29b80d0 100644 --- a/dev-lang/maude/ChangeLog +++ b/dev-lang/maude/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/maude -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.11 2008/06/04 03:40:46 markusle Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/ChangeLog,v 1.12 2009/02/10 05:01:37 dirtyepic Exp $ + + 10 Feb 2009; Ryan Hill <dirtyepic@gentoo.org> + +files/maude-2.3.0-gcc43.patch, maude-2.3.0.ebuild: + Fix building with GCC 4.3 for bug #227529 *maude-2.3.0 (04 Jun 2008) diff --git a/dev-lang/maude/Manifest b/dev-lang/maude/Manifest index 96a6934884aa..056315d67a24 100644 --- a/dev-lang/maude/Manifest +++ b/dev-lang/maude/Manifest @@ -1,10 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 2.1.1-gcc3.4.patch 7809 RMD160 73e3bcd563ae8d6afde402c0579df5c7adb3bd6b SHA1 57427211adfff03dce82740d3e2b8fd65d08dedf SHA256 fbadb0ed7383312602227d2fa93582c433b698d9268594ab4fc80da2bad5eda6 AUX 23maude 27 RMD160 863fe69a23b9c8c6223c287a3d6e5c3b1ab1c563 SHA1 2cb50693a1968feabedae8e7a32d0c3c0cc41bc7 SHA256 5bbd73fee09b9131453ce264345c88385fc1152d95b5dd79b05069bac330366e +AUX maude-2.3.0-gcc43.patch 3197 RMD160 7ca0655c02f0ce9f2debdec32c806d6b4a2b3775 SHA1 b788570564ed213031df5e7912859c367795070a SHA256 2d00fd0dc2ba05dd3a501c0c62b8a11124613f646c05d69497efe4e00376337b DIST Maude-2.3.tar.gz 1441239 RMD160 8c6b67d257468b4910631f4d6d0f2c3a0ff8d995 SHA1 68fbe7f76db1a5a5bb748cb751c5015d60c476d0 SHA256 67e88d8440fafc67e1121139de496c70844279291e37ba9bee369d113a92fddb DIST maude-2.1.1.tar.bz2 874308 RMD160 ae2891f24cce16801a49a90ba43428ef015398cf SHA1 0a976d9215288d6e3835093d6206415f7ee2f387 SHA256 8dd3d80c5cb1752fef6f2d2824175bf1077509e7bf03c38e4b78e40aa95eb8d2 DIST maude-2.3.0-extras.tar.bz2 2871587 RMD160 dd61d0cfa517d29031e55300376b32fd3173bfba SHA1 fcc6f8dab0c26d7bfe03a4bcf37417f6c315cd3f SHA256 0dd0d71cb5a1463c9888303c1ed74c6d373d6aa60a9a45660e92f3308730a54d DIST maude-full-doc-2.1.1.tar.bz2 3047855 RMD160 de4fc555f686bd6d62aaaf3289b026143e429412 SHA1 23186afa0fba59baa504fab2efdc6e31297e08db SHA256 9d6ae27ffbb525c08dc3474bf010c88703ba552fde2e8134066b0d69951a9b49 EBUILD maude-2.1.1-r2.ebuild 1667 RMD160 c382a5fe12f1293d9a0dffc6bf035120354eabec SHA1 b0dfd2f960721cad938c05cbdbe2893f25602147 SHA256 dec08bb93466acafd4ba4ab8cbe9b3ef694dabfa1025c9a7f1defdb8b3440ac9 -EBUILD maude-2.3.0.ebuild 1445 RMD160 177f0a9704e31b2d19b80de61cb901bdeb1eb533 SHA1 171ca91b78cf0857defad69dce1abddf7f11a2d7 SHA256 24d97e599ee3e3e6fa364a415645d56b1a72fdf14718f0fb6bd825d8889a6d13 -MISC ChangeLog 2023 RMD160 f97a9d19e9473ae9508897396e7de8faa506aa87 SHA1 eb374666d0c18a3be178f46d14a731a25841c009 SHA256 93cefe6064a00966809250720874707ae3f129759b897209570dd9897213496e +EBUILD maude-2.3.0.ebuild 1527 RMD160 64ed8b91dd460447fa752b37b8463c50f083ac0d SHA1 65cbd03e540cc1d0c65919864f9b7e20bbb88f1b SHA256 95a12b95b0478163eb0c86749d0bf20214f3bce8db21c5a1915290722963faa5 +MISC ChangeLog 2171 RMD160 de64052e257d27dfd26d30693f9bb2cab9864ad9 SHA1 43dc1bacaf1ea708c2e6af6209556d99c4962115 SHA256 5df26a76095055f161f8293a825d270e0b171e9895d39a9bb6f428fb51dec311 MISC metadata.xml 612 RMD160 14c7abbd8a7ce730cda7958315c67781f89d5e36 SHA1 e5e3f3d01414e8fcb96dfe5b4fd73a8ad2a321bb SHA256 267089654efa86ae5fa39c9a9f24392cf29dfbc24540bc7c76161239b9877c21 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkmRCoAACgkQiqiDRvmkBmJUJwCgm5/xa+QZX3IDOBoBsJcW3ioi +I24AoI+x4/h4wDsDEzJpckxPLFPxE+G1 +=VSsg +-----END PGP SIGNATURE----- diff --git a/dev-lang/maude/files/maude-2.3.0-gcc43.patch b/dev-lang/maude/files/maude-2.3.0-gcc43.patch new file mode 100644 index 000000000000..457359519b87 --- /dev/null +++ b/dev-lang/maude/files/maude-2.3.0-gcc43.patch @@ -0,0 +1,107 @@ +--- Maude-2.3/src/BuiltIn/stringOpSymbol.cc 2003-11-10 18:33:00.000000000 -0600 ++++ Maude-2.4/src/BuiltIn/stringOpSymbol.cc 2008-09-11 19:03:36.000000000 -0600 +@@ -220,7 +220,9 @@ StringOpSymbol::eqRewrite(DagNode* subje + case CODE('f', 'l'): + { + bool error; +- //double fl = stringToDouble(left.c_str(), error); ++#ifdef ROPE_C_STR_BROKEN ++ // ++ // This kudge doesn't seem to be need nowadays, but copy() doesn't work. + // + // This messing about is needed because Rope::c_str() + // fails in libstdc++-v3 +@@ -231,7 +233,9 @@ StringOpSymbol::eqRewrite(DagNode* subje + t[len] = '\0'; + double fl = stringToDouble(t, error); + delete [] t; +- // ++#else ++ double fl = stringToDouble(left.c_str(), error); ++#endif + if (error) + goto fail; + return floatSymbol->rewriteToFloat(subject, context, fl); +@@ -282,6 +286,7 @@ StringOpSymbol::eqRewrite(DagNode* subje + break; + default: + CantHappen("bad string op"); ++ r = false; // avoid compiler warning + } + Assert(trueTerm.getTerm() != 0 && falseTerm.getTerm() != 0, + "null true/false for relational op"); +@@ -358,6 +363,7 @@ StringOpSymbol::eqRewrite(DagNode* subje + break; + default: + CantHappen("bad string op"); ++ r = 0; // avoid compiler warning + } + Assert(notFoundTerm.getTerm() != 0, "null notFound for find op"); + if (r == NONE) +@@ -591,6 +597,13 @@ StringOpSymbol::ropeToNumber(const crope + if (!isalnum(subject[j])) + return false; + } ++ // ++ // We have detected a fraction form. ++ // ++#ifdef ROPE_C_STR_BROKEN ++ // ++ // This kudge doesn't seem to be need nowadays, but copy() doesn't work. ++ // + char* t = new char[len]; // longer than needed but who cares + int dLen = len - (i + 1); + subject.copy(i + 1, dLen, t); +@@ -609,20 +622,34 @@ StringOpSymbol::ropeToNumber(const crope + } + delete [] t; + return true; ++#else ++ return mpz_set_str(denominator.get_mpz_t(), subject.substr(i + 1).c_str(), base) == 0 && ++ mpz_set_str(numerator.get_mpz_t(), subject.substr(0,i).c_str(), base) == 0; ++#endif + } + else + return false; + } + } ++ // ++ // We have a regular integer form. ++ // ++ denominator = 0; ++#ifdef ROPE_C_STR_BROKEN ++ // ++ // This kudge doesn't seem to be need nowadays, but copy() doesn't work. ++ // + char* t = new char[len + 1]; + subject.copy(t); + t[len] = '\0'; + if (mpz_set_str(numerator.get_mpz_t(), t, base) == 0) + { + delete [] t; +- denominator = 0; + return true; + } + delete [] t; +- return false; ++ return false; ++#else ++ return mpz_set_str(numerator.get_mpz_t(), subject.c_str(), base) == 0; ++#endif + } +--- Maude-2.3/src/Utility/macros.hh 2007-01-11 21:13:21.000000000 -0600 ++++ Maude-2.4/src/Utility/macros.hh 2008-09-04 13:52:55.000000000 -0600 +@@ -50,10 +50,10 @@ + #if HAVE_CTYPE_H + #include <ctype.h> + #endif +-#if HAVE_STRINGS_H +-#include <strings.h> +-#elif HAVE_STRING_H ++#if HAVE_STRING_H + #include <string.h> ++#elif HAVE_STRINGS_H ++#include <strings.h> + #endif + #if HAVE_UNISTD_H + #include <unistd.h> // needed by solaris diff --git a/dev-lang/maude/maude-2.3.0.ebuild b/dev-lang/maude/maude-2.3.0.ebuild index 9f9f36af53c5..c5d66a52fbf5 100644 --- a/dev-lang/maude/maude-2.3.0.ebuild +++ b/dev-lang/maude/maude-2.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.2 2008/06/04 15:55:37 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/maude/maude-2.3.0.ebuild,v 1.3 2009/02/10 05:01:37 dirtyepic Exp $ inherit toolchain-funcs eutils versionator @@ -28,6 +28,13 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MY_PN}-${MY_PV} +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${P}-gcc43.patch +} + src_compile() { econf || die "econf failed" emake -j1 || die "emake failed" |