From 6618d28648702b0d7ab931b6033223ec1a3ef2ed Mon Sep 17 00:00:00 2001 From: Patrick Kursawe Date: Mon, 13 Dec 2004 12:55:25 +0000 Subject: [PATCH] making ready for gcc 3.4 --- app-sci/Macaulay2/ChangeLog | 7 +++- app-sci/Macaulay2/Macaulay2-0.9.2.ebuild | 17 +++++---- app-sci/Macaulay2/Manifest | 8 ++-- .../files/gentoo-Macaulay2-0.9.2.diff | 37 +++++++++++++++++++ .../Macaulay2/files/gentoo-factory-1.3b.diff | 11 ++++++ 5 files changed, 68 insertions(+), 12 deletions(-) diff --git a/app-sci/Macaulay2/ChangeLog b/app-sci/Macaulay2/ChangeLog index 6690ced3ae8f..a824abcb942b 100644 --- a/app-sci/Macaulay2/ChangeLog +++ b/app-sci/Macaulay2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-sci/Macaulay2 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/ChangeLog,v 1.2 2004/06/24 22:09:03 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/ChangeLog,v 1.3 2004/12/13 12:55:25 phosphan Exp $ + + 13 Dec 2004; Patrick Kursawe + files/gentoo-Macaulay2-0.9.2.diff, files/gentoo-factory-1.3b.diff, + Macaulay2-0.9.2.ebuild: + Extending patches to get the program through gcc 3.4 *Macaulay2-0.9.2 (19 May 2004) diff --git a/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild b/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild index 8a8e64c176cd..a7aae7d0ea56 100644 --- a/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild +++ b/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.2 2004/06/24 22:09:03 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-sci/Macaulay2/Macaulay2-0.9.2.ebuild,v 1.3 2004/12/13 12:55:25 phosphan Exp $ -inherit flag-o-matic +inherit eutils flag-o-matic toolchain-funcs IUSE="" @@ -15,7 +15,7 @@ HOMEPAGE="http://www.math.uiuc.edu/Macaulay2/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86" +KEYWORDS="x86" RDEPEND="sys-libs/gdbm dev-libs/gmp @@ -26,26 +26,29 @@ DEPEND="${RDEPEND} dev-util/yacc" src_compile() { + if [ "$(gcc-version)" = "3.4" ]; then + append-flags "-fno-unit-at-a-time" # gcc 3.4 bug #15114, phosphan + fi cd ${WORKDIR}/factory - patch -p1 < ${FILESDIR}/gentoo-factory-1.3b.diff || die + epatch ${FILESDIR}/gentoo-factory-1.3b.diff ./configure --disable-streamio --prefix=${WORKDIR} || die make || die make install || die cd ${WORKDIR}/libfac - patch -p1 < ../Macaulay2-0.9.2/INSTALL.libfac-0.3.2-diffs || die + epatch ../Macaulay2-0.9.2/INSTALL.libfac-0.3.2-diffs ./configure --prefix=${WORKDIR} || die make DEFS=-DHAVE_SINGULAR_ERROR || die make prefix=${WORKDIR} install || die cd ${WORKDIR}/include - patch -p1 < ${FILESDIR}/gentoo-libfac-0.3.2.include.diff || die + epatch ${FILESDIR}/gentoo-libfac-0.3.2.include.diff CXXFLAGS="${CXXFLAGS} -Wno-deprecated" filter-flags "-fomit-frame-pointer" cd ${WORKDIR}/Macaulay2-0.9.2 - patch -p1 < ${FILESDIR}/gentoo-Macaulay2-0.9.2.diff || die + epatch ${FILESDIR}/gentoo-Macaulay2-0.9.2.diff CPPFLAGS='-I/usr/include/gc -I${WORKDIR}/include' LDFLAGS=-L${WORKDIR}/lib \ ./configure --prefix=${D}/usr || die make || die diff --git a/app-sci/Macaulay2/Manifest b/app-sci/Macaulay2/Manifest index 18cd2723f6fb..4256434742ba 100644 --- a/app-sci/Macaulay2/Manifest +++ b/app-sci/Macaulay2/Manifest @@ -1,7 +1,7 @@ -MD5 386f4ea28ad7620b8d610f97353e3c95 Macaulay2-0.9.2.ebuild 2499 -MD5 26d94920cb5d288131aaf092da78cc5c ChangeLog 538 +MD5 ee6f02d0e41ad14889cba1b79f5eb6cf Macaulay2-0.9.2.ebuild 2584 +MD5 11178139341ebefcbb14ef34a55660ec ChangeLog 742 MD5 8ed0bde4e7e96671f190d97c92e1d67b metadata.xml 514 -MD5 221ec4d59e380f7a0a0979785ccf622a files/gentoo-Macaulay2-0.9.2.diff 9420 +MD5 0926cfa1c448a5d6464a6c0fc04425d6 files/gentoo-Macaulay2-0.9.2.diff 10410 MD5 02f8c3fb68df6d22a55f92102a3956ee files/gentoo-libfac-0.3.2.include.diff 641 -MD5 b8028ea09b5377820ea3f76a15c3e8b5 files/gentoo-factory-1.3b.diff 312 +MD5 22fafa18c7db240002ce1110747a9c9b files/gentoo-factory-1.3b.diff 680 MD5 49353124d1f121c795a570079153114d files/digest-Macaulay2-0.9.2 199 diff --git a/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff b/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff index d50c8d06a9f9..358705c770ec 100644 --- a/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff +++ b/app-sci/Macaulay2/files/gentoo-Macaulay2-0.9.2.diff @@ -206,3 +206,40 @@ diff -U 3 -dHrN -- Macaulay2-0.9.2-orig/include/config.Makefile.in Macaulay2-0.9 bindir = $(target)/bin RANLIB = @RANLIB@ +--- Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp 1999-09-09 23:47:12.000000000 +0200 ++++ Macaulay2-0.9.2/Macaulay2/e/EGB1.hpp.new 2004-12-13 11:48:17.208554431 +0100 +@@ -104,8 +104,6 @@ + }; + class EGB1 : public EGroebnerComputation + { +- class iterator; +- friend class iterator; + private: + // Ring information + const EInterface I; +@@ -255,6 +253,9 @@ + + virtual int new_calc(const EStopConditions &stop); + ++ class iterator; ++ friend class iterator; ++ + class iterator { + const EGB1 *comp; + int i; +--- Macaulay2-0.9.2/include/config.Makefile.in 2004-12-13 12:29:02.776249827 +0100 ++++ Macaulay2-0.9.2/include/config.Makefile.in.new 2004-12-13 12:47:35.221607868 +0100 +@@ -110,13 +110,6 @@ + ifeq "$(GCC)" "yes" + CFLAGS += -Wall -Wshadow -Wcast-qual + CXXFLAGS += -Wall -Wshadow -Wcast-qual +-ifeq "$(OPTIMIZE)" "yes" +-CFLAGS += -O3 -fexpensive-optimizations +-CXXFLAGS += -O3 -fexpensive-optimizations +-else +-CFLAGS += -O0 +-CXXFLAGS += -O0 +-endif + endif + + ifeq "$(STRIP)" "no" diff --git a/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff b/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff index b7d82502f1b2..d600ce003f54 100644 --- a/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff +++ b/app-sci/Macaulay2/files/gentoo-factory-1.3b.diff @@ -11,3 +11,14 @@ diff -U 4 -H -d -r -N -- factory-org/cf_gmp.h factory/cf_gmp.h -} #endif /* ! INCL_CF_GMP_H */ +--- factory/cf_random.h 2001-06-25 09:51:46.000000000 +0200 ++++ factory.new/cf_random.h 2004-12-13 11:25:04.000000000 +0100 +@@ -62,6 +62,8 @@ + ~AlgExtRandomF(); + CanonicalForm generate() const; + CFRandom * clone() const; ++ ++ friend CFFList FpFactorizeUnivariateCZ(const CanonicalForm&, bool, int, Variable, Variable); + }; + + class CFRandomFactory { -- 2.26.2