1 |
bicatali 12/07/06 19:01:37 |
2 |
|
3 |
Modified: taucs-2.2.ebuild ChangeLog |
4 |
Log: |
5 |
Remove buggy cilk from tests and cleanup shared library building |
6 |
|
7 |
(Portage version: 2.1.11.5/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.8 sci-libs/taucs/taucs-2.2.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild?rev=1.8&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild?rev=1.8&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild?r1=1.7&r2=1.8 |
15 |
|
16 |
Index: taucs-2.2.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v |
19 |
retrieving revision 1.7 |
20 |
retrieving revision 1.8 |
21 |
diff -u -r1.7 -r1.8 |
22 |
--- taucs-2.2.ebuild 4 May 2012 08:22:53 -0000 1.7 |
23 |
+++ taucs-2.2.ebuild 6 Jul 2012 19:01:37 -0000 1.8 |
24 |
@@ -1,10 +1,10 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.7 2012/05/04 08:22:53 jdhore Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/taucs-2.2.ebuild,v 1.8 2012/07/06 19:01:37 bicatali Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
-inherit eutils flag-o-matic fortran-2 toolchain-funcs |
33 |
+inherit eutils fortran-2 toolchain-funcs |
34 |
|
35 |
DESCRIPTION="C library of sparse linear solvers" |
36 |
HOMEPAGE="http://www.tau.ac.il/~stoledo/taucs/" |
37 |
@@ -26,23 +26,28 @@ |
38 |
|
39 |
S="${WORKDIR}" |
40 |
|
41 |
+src_prepare() { |
42 |
+ # test with cilk has memory leaks |
43 |
+ epatch "${FILESDIR}"/${P}-no-test-cilk.patch |
44 |
+} |
45 |
+ |
46 |
src_configure() { |
47 |
cat > config/linux_shared.mk <<-EOF |
48 |
- CFLAGS=${CFLAGS} -fPIC |
49 |
FC=$(tc-getFC) |
50 |
CC=$(tc-getCC) |
51 |
+ CFLAGS=${CFLAGS} -fPIC |
52 |
FFLAGS=${FFLAGS} -fPIC |
53 |
LDFLAGS=${LDFLAGS} -fPIC |
54 |
LIBBLAS=$(pkg-config --libs blas) |
55 |
LIBLAPACK=$(pkg-config --libs lapack) |
56 |
LIBF77= |
57 |
EOF |
58 |
- [[ $(tc-getFC) =~ fortran ]] && echo "LIBF77=-lgfortran" >> config/linux_shared.mk |
59 |
+ |
60 |
echo "LIBMETIS=$(pkg-config --libs metis)" >> config/linux_shared.mk |
61 |
# no cat <<EOF because -o has a trailing space |
62 |
if use cilk; then |
63 |
echo "CILKC=cilkc" >> config/linux_shared.mk |
64 |
- echo "CILKFLAGS=-O2 -I/usr/include/cilk -fPIC" >> config/linux_shared.mk |
65 |
+ echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk |
66 |
echo "CILKOUTFLG=-o " >> config/linux_shared.mk |
67 |
fi |
68 |
sed -e 's/ -fPIC//g' \ |
69 |
@@ -60,17 +65,16 @@ |
70 |
emake |
71 |
|
72 |
cd lib/linux_shared |
73 |
- $(tc-getAR) x libtaucs.a |
74 |
- $(tc-getLD) $(raw-ldflags) *.o \ |
75 |
- -shared \ |
76 |
- -soname libtaucs.so.1 \ |
77 |
- -o libtaucs.so.1.0.0 \ |
78 |
+ $(tc-getFC) ${LDFLAGS} -shared -Wl,-soname=libtaucs.so.1 \ |
79 |
+ -Wl,--whole-archive libtaucs.a -Wl,--no-whole-archive \ |
80 |
$(pkg-config --libs blas lapack metis) \ |
81 |
+ -o libtaucs.so.1.0.0 \ |
82 |
|| die "shared lib linking failed" |
83 |
} |
84 |
|
85 |
src_test() { |
86 |
- ./testscript variant=_static || die "compile test failed" |
87 |
+ LD_LIBRARY_PATH=lib/linux_shared \ |
88 |
+ ./testscript variant=_shared || die "compile test failed" |
89 |
if grep -q FAILED testscript.log; then |
90 |
eerror "Test failed. See ${S}/testscript.log" |
91 |
die "test failed" |
92 |
@@ -78,17 +82,13 @@ |
93 |
} |
94 |
|
95 |
src_install() { |
96 |
- if use static-libs; then |
97 |
- dolib.a lib/linux_static/libtaucs.a |
98 |
- fi |
99 |
- dolib.so lib/linux_shared/libtaucs.so.1.0.0 |
100 |
- dosym libtaucs.so.1.0.0 /usr/$(get_libdir)/libtaucs.so.1 |
101 |
- dosym libtaucs.so.1 /usr/$(get_libdir)/libtaucs.so |
102 |
+ use static-libs && dolib.a lib/linux_static/libtaucs.a |
103 |
+ ln -s libtaucs.so.1.0.0 lib/linux_shared/libtaucs.so.1 |
104 |
+ ln -s libtaucs.so.1 lib/linux_shared/libtaucs.so |
105 |
+ dolib.so lib/linux_shared/libtaucs.so* |
106 |
|
107 |
insinto /usr/include |
108 |
doins build/*/*.h src/*.h |
109 |
|
110 |
- use doc && \ |
111 |
- insinto /usr/share/doc/${PF} && \ |
112 |
- doins doc/*.pdf |
113 |
+ use doc && dodoc doc/*.pdf |
114 |
} |
115 |
|
116 |
|
117 |
|
118 |
1.8 sci-libs/taucs/ChangeLog |
119 |
|
120 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/ChangeLog?rev=1.8&view=markup |
121 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/ChangeLog?rev=1.8&content-type=text/plain |
122 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/taucs/ChangeLog?r1=1.7&r2=1.8 |
123 |
|
124 |
Index: ChangeLog |
125 |
=================================================================== |
126 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v |
127 |
retrieving revision 1.7 |
128 |
retrieving revision 1.8 |
129 |
diff -u -r1.7 -r1.8 |
130 |
--- ChangeLog 4 May 2012 08:22:53 -0000 1.7 |
131 |
+++ ChangeLog 6 Jul 2012 19:01:37 -0000 1.8 |
132 |
@@ -1,6 +1,10 @@ |
133 |
# ChangeLog for sci-libs/taucs |
134 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
135 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.7 2012/05/04 08:22:53 jdhore Exp $ |
136 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/taucs/ChangeLog,v 1.8 2012/07/06 19:01:37 bicatali Exp $ |
137 |
+ |
138 |
+ 06 Jul 2012; Sébastien Fabbro <bicatali@g.o> |
139 |
+ +files/taucs-2.2-no-test-cilk.patch, taucs-2.2.ebuild: |
140 |
+ Remove buggy cilk from tests and cleanup shared library building |
141 |
|
142 |
04 May 2012; Jeff Horelick <jdhore@g.o> taucs-2.2.ebuild: |
143 |
dev-util/pkgconfig -> virtual/pkgconfig |
144 |
@@ -25,4 +29,3 @@ |
145 |
27 Oct 2008; Sébastien Fabbro <bicatali@g.o> +metadata.xml, |
146 |
+taucs-2.2.ebuild: |
147 |
Initial import |
148 |
- |