From bd5fe6de4a0bf023100197eaf6a6752097058948 Mon Sep 17 00:00:00 2001 From: Markus Dittrich Date: Wed, 25 Oct 2006 16:01:19 +0000 Subject: Fixed compile problems with gcc4 and as-needed LDFLAG (closes bug #152422). (Portage version: 2.1.2_pre3-r7) --- sci-astronomy/orsa/ChangeLog | 8 ++- sci-astronomy/orsa/files/digest-orsa-0.6.1 | 2 + .../orsa/files/orsa-0.6.1-as-needed.patch | 12 +++++ sci-astronomy/orsa/files/orsa-0.6.1-gcc4.patch | 60 ++++++++++++++++++++++ sci-astronomy/orsa/orsa-0.6.1.ebuild | 11 +++- 5 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 sci-astronomy/orsa/files/orsa-0.6.1-as-needed.patch create mode 100644 sci-astronomy/orsa/files/orsa-0.6.1-gcc4.patch (limited to 'sci-astronomy/orsa') diff --git a/sci-astronomy/orsa/ChangeLog b/sci-astronomy/orsa/ChangeLog index 456deb638569..6603f36ff9f6 100644 --- a/sci-astronomy/orsa/ChangeLog +++ b/sci-astronomy/orsa/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-astronomy/orsa # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.12 2006/06/24 00:02:33 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/ChangeLog,v 1.13 2006/10/25 16:01:19 markusle Exp $ + + 25 Oct 2006; Markus Dittrich + +files/orsa-0.6.1-as-needed.patch, +files/orsa-0.6.1-gcc4.patch, + orsa-0.6.1.ebuild: + Fixed compile problems with gcc4 and as-needed LDFLAG + (closes bug #152422). 23 Jun 2006; Doug Goldstein orsa-0.6.1.ebuild: USE flag qt->qt3/qt4 change diff --git a/sci-astronomy/orsa/files/digest-orsa-0.6.1 b/sci-astronomy/orsa/files/digest-orsa-0.6.1 index b7bf044a14a9..311b85118718 100644 --- a/sci-astronomy/orsa/files/digest-orsa-0.6.1 +++ b/sci-astronomy/orsa/files/digest-orsa-0.6.1 @@ -1 +1,3 @@ MD5 82d3919b04a076072f510b6122c06fca orsa-0.6.1.tar.gz 763872 +RMD160 ad9de4bc511719bbb7ec936a76dfc692bddbf26f orsa-0.6.1.tar.gz 763872 +SHA256 cf87cf675edb75dcf3a57108f79128691c625cc9122c99474403845cf89d1282 orsa-0.6.1.tar.gz 763872 diff --git a/sci-astronomy/orsa/files/orsa-0.6.1-as-needed.patch b/sci-astronomy/orsa/files/orsa-0.6.1-as-needed.patch new file mode 100644 index 000000000000..fc10b3a0fe8f --- /dev/null +++ b/sci-astronomy/orsa/files/orsa-0.6.1-as-needed.patch @@ -0,0 +1,12 @@ +diff -Naur orsa-0.6.1/src/liborsa/Makefile.in orsa-0.6.1-new/src/liborsa/Makefile.in +--- orsa-0.6.1/src/liborsa/Makefile.in 2004-07-08 19:29:01.000000000 -0400 ++++ orsa-0.6.1-new/src/liborsa/Makefile.in 2006-10-25 10:15:20.000000000 -0400 +@@ -387,7 +387,7 @@ + $(AM_CXXFLAGS) $(CXXFLAGS) + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ $(GLLIB) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + DIST_SOURCES = $(liborsa_la_SOURCES) + HEADERS = $(pkginclude_HEADERS) diff --git a/sci-astronomy/orsa/files/orsa-0.6.1-gcc4.patch b/sci-astronomy/orsa/files/orsa-0.6.1-gcc4.patch new file mode 100644 index 000000000000..1485d7f10d92 --- /dev/null +++ b/sci-astronomy/orsa/files/orsa-0.6.1-gcc4.patch @@ -0,0 +1,60 @@ +diff -Naur orsa-0.6.1/src/liborsa/orsa_body.h orsa-0.6.1-new/src/liborsa/orsa_body.h +--- orsa-0.6.1/src/liborsa/orsa_body.h 2004-07-05 17:59:44.000000000 -0400 ++++ orsa-0.6.1-new/src/liborsa/orsa_body.h 2006-10-25 09:25:36.000000000 -0400 +@@ -215,7 +215,7 @@ + // void SetVelocity(const Vector &v, bool sync_child=true, Body *ref_body=0); + + // b position - this position +- inline Vector Body::distanceVector(const Body & b) const { return b.position()-position(); } ++ inline Vector distanceVector(const Body & b) const { return b.position()-position(); } + inline double distance(const Body & b) const { return distanceVector(b).Length(); } + + // alias +diff -Naur orsa-0.6.1/src/libxorsa/xorsa_analysis.h orsa-0.6.1-new/src/libxorsa/xorsa_analysis.h +--- orsa-0.6.1/src/libxorsa/xorsa_analysis.h 2004-06-24 20:58:30.000000000 -0400 ++++ orsa-0.6.1-new/src/libxorsa/xorsa_analysis.h 2006-10-25 09:32:16.000000000 -0400 +@@ -129,7 +129,7 @@ + XOrsaPeaksListItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null); + + public: +- int XOrsaPeaksListItem::compare(QListViewItem * i, int col, bool ascending) const; ++ int compare(QListViewItem * i, int col, bool ascending) const; + + }; + +diff -Naur orsa-0.6.1/src/libxorsa/xorsa_import_astorb_objects.h orsa-0.6.1-new/src/libxorsa/xorsa_import_astorb_objects.h +--- orsa-0.6.1/src/libxorsa/xorsa_import_astorb_objects.h 2004-07-05 20:10:14.000000000 -0400 ++++ orsa-0.6.1-new/src/libxorsa/xorsa_import_astorb_objects.h 2006-10-25 09:26:30.000000000 -0400 +@@ -600,7 +600,7 @@ + inline XOrsaAstorbObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null) : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8) { }; + + public: +- inline int XOrsaAstorbObjectItem::compare(QListViewItem *i, int col, bool ascending) const { ++ inline int compare(QListViewItem *i, int col, bool ascending) const { + + XOrsaAstorbObjectItem *ii = dynamic_cast (i); + +diff -Naur orsa-0.6.1/src/libxorsa/xorsa_object_selector.cc orsa-0.6.1-new/src/libxorsa/xorsa_object_selector.cc +--- orsa-0.6.1/src/libxorsa/xorsa_object_selector.cc 2004-06-24 23:12:57.000000000 -0400 ++++ orsa-0.6.1-new/src/libxorsa/xorsa_object_selector.cc 2006-10-25 09:54:01.000000000 -0400 +@@ -40,7 +40,7 @@ + XOrsaObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null); + + public: +- int XOrsaObjectItem::compare(QListViewItem * i, int col, bool ascending) const; ++ int compare(QListViewItem * i, int col, bool ascending) const; + + }; + +diff -Naur orsa-0.6.1/src/orsa/xorsa.h orsa-0.6.1-new/src/orsa/xorsa.h +--- orsa-0.6.1/src/orsa/xorsa.h 2004-06-24 23:30:28.000000000 -0400 ++++ orsa-0.6.1-new/src/orsa/xorsa.h 2006-10-25 10:01:42.000000000 -0400 +@@ -60,7 +60,7 @@ + ObjectItem(QListView *parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null); + + public: +- int ObjectItem::compare(QListViewItem * i, int col, bool ascending) const; ++ int compare(QListViewItem * i, int col, bool ascending) const; + + }; + diff --git a/sci-astronomy/orsa/orsa-0.6.1.ebuild b/sci-astronomy/orsa/orsa-0.6.1.ebuild index 81fb88e86017..8fd806d6ab46 100644 --- a/sci-astronomy/orsa/orsa-0.6.1.ebuild +++ b/sci-astronomy/orsa/orsa-0.6.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.8 2006/06/23 23:59:31 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/orsa/orsa-0.6.1.ebuild,v 1.9 2006/10/25 16:01:19 markusle Exp $ inherit base flag-o-matic qt3 @@ -28,6 +28,13 @@ replace-flags k6-3 i586 replace-flags k6-2 i586 replace-flags k6 i586 +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-gcc4.patch +} + src_compile() { if ! use mpi; then export MPICXX="g++" @@ -60,7 +67,7 @@ src_compile() { } src_install() { - einstall || die + make install DESTDIR=${D} || die "install failed" dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS dodoc src/test/* } -- cgit v1.2.3-65-gdbad