1 |
commit: ed349b29014280084c18fa71988297b6d36f8d74 |
2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 28 16:42:32 2012 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 28 16:42:32 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ed349b29 |
7 |
|
8 |
sci-physics/LoopTools: shared library generation and dependency on virtual/fortran added |
9 |
|
10 |
(Portage version: 2.2.0_alpha121/git/Linux i686, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
sci-physics/LoopTools/ChangeLog | 7 ++ |
14 |
...oopTools-2.7.ebuild => LoopTools-2.7-r1.ebuild} | 7 +- |
15 |
.../LoopTools/files/LoopTools-2.7-makefile.patch | 73 +++++++++++++++++++- |
16 |
3 files changed, 81 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/sci-physics/LoopTools/ChangeLog b/sci-physics/LoopTools/ChangeLog |
19 |
index 87f268c..8ea8e6b 100644 |
20 |
--- a/sci-physics/LoopTools/ChangeLog |
21 |
+++ b/sci-physics/LoopTools/ChangeLog |
22 |
@@ -2,6 +2,13 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*LoopTools-2.7-r1 (28 Aug 2012) |
27 |
+ |
28 |
+ 28 Aug 2012; Jauhien Piatlicki (jauhien) <piatlicki@×××××.com> |
29 |
+ -LoopTools-2.7.ebuild, +LoopTools-2.7-r1.ebuild, |
30 |
+ files/LoopTools-2.7-makefile.patch: |
31 |
+ shared library generation and dependency on virtual/fortran added |
32 |
+ |
33 |
*LoopTools-2.7 (05 Jul 2012) |
34 |
|
35 |
05 Jul 2012; Jauhien Piatlicki (jauhien) piatlicki@×××××.com |
36 |
|
37 |
diff --git a/sci-physics/LoopTools/LoopTools-2.7.ebuild b/sci-physics/LoopTools/LoopTools-2.7-r1.ebuild |
38 |
similarity index 82% |
39 |
rename from sci-physics/LoopTools/LoopTools-2.7.ebuild |
40 |
rename to sci-physics/LoopTools/LoopTools-2.7-r1.ebuild |
41 |
index 61672a5..76182c1 100644 |
42 |
--- a/sci-physics/LoopTools/LoopTools-2.7.ebuild |
43 |
+++ b/sci-physics/LoopTools/LoopTools-2.7-r1.ebuild |
44 |
@@ -4,7 +4,7 @@ |
45 |
|
46 |
EAPI=4 |
47 |
|
48 |
-inherit eutils |
49 |
+inherit eutils fortran-2 |
50 |
|
51 |
DESCRIPTION="A package for evaluation of scalar and tensor one-loop integrals" |
52 |
HOMEPAGE="http://www.feynarts.de/looptools" |
53 |
@@ -16,9 +16,10 @@ SLOT="0" |
54 |
KEYWORDS="~x86" |
55 |
IUSE="" |
56 |
|
57 |
-DEPEND="" |
58 |
-RDEPEND="" |
59 |
+DEPEND="virtual/fortran" |
60 |
+RDEPEND="${DEPEND}" |
61 |
|
62 |
src_prepare() { |
63 |
epatch "${FILESDIR}/${P}-makefile.patch" |
64 |
+ export VER="${PV}" |
65 |
} |
66 |
|
67 |
diff --git a/sci-physics/LoopTools/files/LoopTools-2.7-makefile.patch b/sci-physics/LoopTools/files/LoopTools-2.7-makefile.patch |
68 |
index 4dfc847..10df86d 100644 |
69 |
--- a/sci-physics/LoopTools/files/LoopTools-2.7-makefile.patch |
70 |
+++ b/sci-physics/LoopTools/files/LoopTools-2.7-makefile.patch |
71 |
@@ -1,6 +1,6 @@ |
72 |
--- makefile.in |
73 |
+++ makefile.in |
74 |
-@@ -1,8 +1,8 @@ |
75 |
+@@ -1,14 +1,17 @@ |
76 |
BLD = build$(QUADSUFFIX) |
77 |
|
78 |
-LIBDIR = $(PREFIX)/lib$(LIBDIRSUFFIX) |
79 |
@@ -12,11 +12,47 @@ |
80 |
|
81 |
LIB = libooptools$(QUADSUFFIX).a |
82 |
FE = lt$(QUADSUFFIX)$(EXE) |
83 |
-@@ -38,13 +38,12 @@ |
84 |
+ MFE = LoopTools$(QUADSUFFIX)$(EXE) |
85 |
+ INCLUDE = $(BLD)/looptools.h $(BLD)/clooptools.h |
86 |
+ |
87 |
++LIBRARY=libooptools.so |
88 |
++REALNAME=$(LIBRARY).$(VER) |
89 |
++ |
90 |
+ ARGS = $(PARALLEL) \ |
91 |
+ LIB="$(LIB)" \ |
92 |
+ FE="$(FE)" \ |
93 |
+@@ -16,12 +19,12 @@ |
94 |
+ EXE="$(EXE)" \ |
95 |
+ DEF="$(DEF)" \ |
96 |
+ NOUNDERSCORE="$(NOUNDERSCORE)" \ |
97 |
+- XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I." \ |
98 |
++ XFC="$(FC$(QUADSUFFIX)) $(FFLAGS) $(FFLAGS-quad) -I. -fPIC" \ |
99 |
+ F90="$(F90)" \ |
100 |
+ CC="$(CC)" \ |
101 |
+- CFLAGS="$(CFLAGS) $(CFLAGS-quad)" \ |
102 |
++ CFLAGS="$(CFLAGS) $(CFLAGS-quad) -fPIC" \ |
103 |
+ CXX="$(CXX)" \ |
104 |
+- CXXFLAGS="$(CXXFLAGS)" \ |
105 |
++ CXXFLAGS="$(CXXFLAGS) -fPIC" \ |
106 |
+ ML="$(ML)" \ |
107 |
+ MCC="$(MCC)" \ |
108 |
+ MCFLAGS="$(MCFLAGS)" \ |
109 |
+@@ -31,20 +34,22 @@ |
110 |
+ DLLTOOL="$(DLLTOOL)" \ |
111 |
+ LDFLAGS="$(LDFLAGS)" \ |
112 |
+ LIBPATH="$(LIBPATH)" \ |
113 |
+- OBJS-quad="$(OBJS-quad)" |
114 |
++ OBJS-quad="$(OBJS-quad)" \ |
115 |
++ REALNAME="$(REALNAME)" |
116 |
+ |
117 |
+ |
118 |
+-default all lib frontend mma: force |
119 |
++default all lib solib frontend mma: force |
120 |
cd $(BLD) && $(MAKE) $(ARGS) $@ |
121 |
|
122 |
- install: lib frontend |
123 |
+-install: lib frontend |
124 |
- -mkdir $(PREFIX) |
125 |
++install: lib solib frontend |
126 |
+ -mkdir $(DESTDIR)$(PREFIX) |
127 |
-mkdir $(LIBDIR) $(BINDIR) $(INCLUDEDIR) |
128 |
cp -p $(BLD)/$(LIB) $(LIBDIR) |
129 |
@@ -25,5 +61,36 @@ |
130 |
cp -p $(BLD)/fcc $(BLD)/$(FE) $(BINDIR) |
131 |
- test ! -f $(BLD)/$(MFE) || { strip $(BLD)/$(MFE) ; cp -p $(BLD)/$(MFE) $(BINDIR); } |
132 |
+ test ! -f $(BLD)/$(MFE) || { cp -p $(BLD)/$(MFE) $(BINDIR); } |
133 |
++ cp -p $(BLD)/$(REALNAME) $(LIBDIR) |
134 |
++ cd $(LIBDIR) && ln -s $(REALNAME) $(LIBRARY) |
135 |
|
136 |
force: $(BLD)/timestamp |
137 |
+ |
138 |
+--- src/makefile |
139 |
++++ src/makefile |
140 |
+@@ -1,6 +1,6 @@ |
141 |
+-default: frontend mma$(ML) |
142 |
++default: frontend mma$(ML) solib |
143 |
+ |
144 |
+-all: frontend mma1 |
145 |
++all: frontend mma1 solib |
146 |
+ |
147 |
+ frontend: lib $(FE) |
148 |
+ |
149 |
+@@ -8,6 +8,7 @@ |
150 |
+ |
151 |
+ mma0 lib: $(LIB) clooptools.h fcc |
152 |
+ |
153 |
++solib: $(REALNAME) fcc |
154 |
+ |
155 |
+ .SUFFIXES: |
156 |
+ |
157 |
+@@ -247,6 +248,8 @@ |
158 |
+ $(AR) cru $(LIB) $? |
159 |
+ -$(RANLIB) $(LIB) |
160 |
+ |
161 |
++$(REALNAME): $(OBJS) |
162 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $? |
163 |
+ |
164 |
+ $(FE): lt.F $(LTINC) $(LIB) |
165 |
+ $(XFC) -o $(FE) lt.F $(LIB) |