summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-08-05 16:26:45 +0000
committerJustin Lecher <jlec@gentoo.org>2012-08-05 16:26:45 +0000
commit17306022724e3f08ae847f68e3045aebf634f194 (patch)
tree4e0f19fc0c9a0ea8df5e0c4d34dcaed427414be5 /sci-visualization/xd3d
parentarm stable, bug #418803 (diff)
downloadgentoo-2-17306022724e3f08ae847f68e3045aebf634f194.tar.gz
gentoo-2-17306022724e3f08ae847f68e3045aebf634f194.tar.bz2
gentoo-2-17306022724e3f08ae847f68e3045aebf634f194.zip
sci-visualization/xd3d: Respect CFLAGS, #430032
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/xd3d')
-rw-r--r--sci-visualization/xd3d/ChangeLog6
-rw-r--r--sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch41
-rw-r--r--sci-visualization/xd3d/xd3d-8.3.1.ebuild5
3 files changed, 49 insertions, 3 deletions
diff --git a/sci-visualization/xd3d/ChangeLog b/sci-visualization/xd3d/ChangeLog
index 0e10c118bc4e..e5583db0dce5 100644
--- a/sci-visualization/xd3d/ChangeLog
+++ b/sci-visualization/xd3d/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-visualization/xd3d
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.17 2012/06/21 14:50:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/ChangeLog,v 1.18 2012/08/05 16:26:45 jlec Exp $
+
+ 05 Aug 2012; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild,
+ +files/xd3d-8.3.1-cflags.patch:
+ Respect CFLAGS, #430032
21 Jun 2012; Justin Lecher <jlec@gentoo.org> xd3d-8.3.1.ebuild:
Add missing multilib.eclass
diff --git a/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
new file mode 100644
index 000000000000..b62129b41bf4
--- /dev/null
+++ b/sci-visualization/xd3d/files/xd3d-8.3.1-cflags.patch
@@ -0,0 +1,41 @@
+ src/various/Makefile | 16 ++++++++--------
+ 1 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/various/Makefile b/src/various/Makefile
+index 7188b2a..80f47ec 100644
+--- a/src/various/Makefile
++++ b/src/various/Makefile
+@@ -3,25 +3,25 @@ include ../../RULES
+ all :; make clair clairc3d create_c3d obscur obscurc3d tradavoir translation txt2avoir
+
+ clair : clair.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clair $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clair $(FCFLAGS) $(INCF) clair.f $(LIBRAIRIE) $(LINKOPTX)
+
+ clairc3d : clairc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/clairc3d $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/clairc3d $(FCFLAGS) $(INCF) clairc3d.f $(LIBRAIRIE) $(LINKOPTX)
+
+ create_c3d : create_c3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/create_c3d $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/create_c3d $(FCFLAGS) $(INCF) create_c3d.f $(LIBRAIRIE) $(LINKOPTX)
+
+ obscur : obscur.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscur $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscur $(FCFLAGS) $(INCF) obscur.f $(LIBRAIRIE) $(LINKOPTX)
+
+ obscurc3d : obscurc3d.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/obscurc3d $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/obscurc3d $(FCFLAGS) $(INCF) obscurc3d.f $(LIBRAIRIE) $(LINKOPTX)
+
+ tradavoir : tradavoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/tradavoir $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/tradavoir $(FCFLAGS) $(INCF) tradavoir.f $(LIBRAIRIE) $(LINKOPTX)
+
+ translation : translation.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/translation $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/translation $(FCFLAGS) $(INCF) translation.f $(LIBRAIRIE) $(LINKOPTX)
+
+ txt2avoir : txt2avoir.f $(LIBRAIRIE) ;\
+-$(LINK) $(BINDIR)/txt2avoir $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
++$(LINK) $(BINDIR)/txt2avoir $(FCFLAGS) $(INCF) txt2avoir.f $(LIBRAIRIE) $(LINKOPTX)
diff --git a/sci-visualization/xd3d/xd3d-8.3.1.ebuild b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
index 819fe97a8a33..03e39fbdca19 100644
--- a/sci-visualization/xd3d/xd3d-8.3.1.ebuild
+++ b/sci-visualization/xd3d/xd3d-8.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.11 2012/06/21 14:50:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/xd3d/xd3d-8.3.1.ebuild,v 1.12 2012/08/05 16:26:45 jlec Exp $
EAPI=4
@@ -25,7 +25,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${P}-gentoo.diff \
"${FILESDIR}"/${P}-parallel.patch \
- "${FILESDIR}"/${P}-rotated.patch
+ "${FILESDIR}"/${P}-rotated.patch \
+ "${FILESDIR}"/${P}-cflags.patch
sed \
-e 's:"zutil.h":<zlib.h>:g' \
-i src/qlib/timestuff.c || die