1 |
commit: cd5ae87a0ba33b68669f67f2b567f24d4f59e3d7 |
2 |
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 31 20:01:52 2011 +0000 |
4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 31 20:01:52 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=cd5ae87a |
7 |
|
8 |
fixed shared libs. added a aliasing patch. switched to eapi4. |
9 |
|
10 |
--- |
11 |
sci-libs/gotoblas2/ChangeLog | 4 +- |
12 |
sci-libs/gotoblas2/Manifest | 4 +- |
13 |
sci-libs/gotoblas2/gotoblas2-1.13.ebuild | 70 +++++++++++++---------------- |
14 |
3 files changed, 35 insertions(+), 43 deletions(-) |
15 |
|
16 |
diff --git a/sci-libs/gotoblas2/ChangeLog b/sci-libs/gotoblas2/ChangeLog |
17 |
index 63e373b..b3aa305 100644 |
18 |
--- a/sci-libs/gotoblas2/ChangeLog |
19 |
+++ b/sci-libs/gotoblas2/ChangeLog |
20 |
@@ -3,8 +3,8 @@ |
21 |
# $Header: $ |
22 |
|
23 |
31 May 2011; Sébastien Fabbro <bicatali@g.o> gotoblas2-1.13.ebuild: |
24 |
- Fixed shared libs. Make ebuild easier to debug with a generated rule Makefile |
25 |
- instead of dynamic. Added a aliasing patch. Switched to EAPI4. |
26 |
+ Fixed shared libs. Make ebuild easier to debug with a generated rule |
27 |
+ Makefile instead of dynamic. Switched to EAPI4. |
28 |
|
29 |
23 Feb 2011; Sébastien Fabbro <bicatali@g.o> gotoblas2-1.13.ebuild, |
30 |
files/gotoblas2-1.13-sharedlibs.patch: |
31 |
|
32 |
diff --git a/sci-libs/gotoblas2/Manifest b/sci-libs/gotoblas2/Manifest |
33 |
index de4f5bc..1a32fb6 100644 |
34 |
--- a/sci-libs/gotoblas2/Manifest |
35 |
+++ b/sci-libs/gotoblas2/Manifest |
36 |
@@ -1,6 +1,6 @@ |
37 |
AUX gotoblas2-1.13-dynamic.patch 608 RMD160 37947ee4aeeec6db1f32132adf97e802369bdaf0 SHA1 f96cb1d7856b4647857b8dc77aa68ceba1d51107 SHA256 7ff5d3179c3051f41fd2963e90734bd6997dd4d6d955ea4c613ff241f49875c4 |
38 |
AUX gotoblas2-1.13-sharedlibs.patch 1929 RMD160 87db891bb2e0b538da7a4f21c10c65b78149a26c SHA1 031912957004745f5e68c2cdf3899f0e80118377 SHA256 fc5f014d6b81a481a9c9c29d82de07f5a5182d9355f90071ba89b680f7e09c1b |
39 |
DIST GotoBLAS2-1.13_bsd.tar.gz 3165294 RMD160 64a416b506b45ec4df33d9d7e9ec893585b794b2 SHA1 0e1a046bb51e50cf8cff5d1732157a083a620e64 SHA256 7c3eab57ef5ad5c42f73adade833a531591e78967bbe9fc6db31310d73fa2d86 |
40 |
-EBUILD gotoblas2-1.13.ebuild 2893 RMD160 737f4cc4b8ba03d284467566b18194f35d83ac20 SHA1 5ee803f982f7a675b9711c35b453ad7586b871df SHA256 546424f15867a0120d9f545df116826c66f0e63c3bc843f21d533b09fb02d488 |
41 |
-MISC ChangeLog 777 RMD160 720e157b296e17fc24754f610d85743190fbb4cb SHA1 0feb30ef75ada3ab57893f7ca6e034ae968af8b6 SHA256 47dedd4a00bf4f4072158d0c740d24abba3f734ec42ddc43c27c7479beb30ebd |
42 |
+EBUILD gotoblas2-1.13.ebuild 2791 RMD160 c845f756ad284fad2fb76ae9e9250d43c942858e SHA1 06be313281ba89d323f422bf69a7ea1b905f78ac SHA256 8f9a6ae33d8a68412115147d545557151d61e101efb57f11a71a377edd7ead76 |
43 |
+MISC ChangeLog 977 RMD160 1029dd4ef2c56cc34416f92d0488f6095dcfb9ef SHA1 305aa88db9c89385ca7224e7eb91c58df4d4a36d SHA256 d8b525cf38540ec0e3ece7b96d47838f5afd86065b89fd56ecd23141b02946ee |
44 |
MISC metadata.xml 856 RMD160 250635ac290516ed28e932e55ec87626d97b228e SHA1 9bdb2a1cb537025e5460141522746f3b07cea92f SHA256 4c5ea594bc1d07713211d39171d628b2cba8b3aeccef73309e816cecc79bd8c9 |
45 |
|
46 |
diff --git a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild |
47 |
index b623f44..4a777a4 100644 |
48 |
--- a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild |
49 |
+++ b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild |
50 |
@@ -2,7 +2,7 @@ |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: $ |
53 |
|
54 |
-EAPI=3 |
55 |
+EAPI=4 |
56 |
|
57 |
inherit eutils toolchain-funcs alternatives-2 |
58 |
|
59 |
@@ -26,8 +26,9 @@ DEPEND="${RDEPEND}" |
60 |
S="${WORKDIR}/${MYPN}" |
61 |
|
62 |
src_prepare() { |
63 |
- epatch "${FILESDIR}"/${P}-dynamic.patch |
64 |
- epatch "${FILESDIR}"/${P}-sharedlibs.patch |
65 |
+ epatch "${FILESDIR}"/${P}-{dynamic,sharedlibs}.patch |
66 |
+ # respect LDFLAGS |
67 |
+ sed -i -e '/^LDFLAGS\s*=/d' Makefile.* || die |
68 |
if ! use dynamic; then |
69 |
sed -i \ |
70 |
-e "/^COMMON_OPT/s/-O2/${CFLAGS}/" \ |
71 |
@@ -45,58 +46,51 @@ src_prepare() { |
72 |
} |
73 |
|
74 |
src_configure() { |
75 |
- local bits=32 |
76 |
- if use amd64 || use alpha || use ppc64 || use sparc || use ia64; then |
77 |
- bits=64 |
78 |
- fi |
79 |
- GOTO_MAKEFLAGS=( |
80 |
- CC=$(tc-getCC) |
81 |
- FC=$(tc-getFC) |
82 |
- LDFLAGS="${LDFLAGS}" |
83 |
- FLDFLAGS="${LDFLAGS}" |
84 |
- BINARY=${bits} |
85 |
- USE_THREAD=$(use threads && echo 1 || echo 0) |
86 |
- USE_OPENMP=$(use openmp && echo 1) |
87 |
- DYNAMIC_ARCH=$(use dynamic && echo 1) |
88 |
- INTERFACE64=$(use int64 && echo 1) |
89 |
- NO_CBLAS=$(use incblas || echo 1) |
90 |
- ) |
91 |
+ local use_openmp=$(use openmp && echo 1) |
92 |
+ use threads && use openmp && use_openmp="" && \ |
93 |
+ einfo "openmp and threads enabled: using threads" |
94 |
+ sed -i \ |
95 |
+ -e "s:^#\s*\(NO_LAPACK\)\s*=.*:\1=1:" \ |
96 |
+ -e "s:^#\s*\(CC\)\s*=.*:\1=$(tc-getCC):" \ |
97 |
+ -e "s:^#\s*\(FC\)\s*=.*:\1=$(tc-getFC):" \ |
98 |
+ -e "s:^#\s*\(USE_THREAD\)\s*=.*:\1=$(use threads && echo 1 || echo 0):" \ |
99 |
+ -e "s:^#\s*\(USE_OPENMP\)\s*=.*:\1=${use_openmp}:" \ |
100 |
+ -e "s:^#\s*\(DYNAMIC_ARCH\)\s*=.*:\1=$(use dynamic && echo 1):" \ |
101 |
+ -e "s:^#\s*\(INTERFACE64\)\s*=.*:\1=$(use int64 && echo 1):" \ |
102 |
+ -e "s:^#\s*\(NO_CBLAS\)\s*=.*:\1=$(use incblas || echo 1):" \ |
103 |
+ Makefile.rule || die |
104 |
} |
105 |
|
106 |
src_compile() { |
107 |
- emake libs shared "${GOTO_MAKEFLAGS[@]}" || die "emake failed" |
108 |
- if use static-libs; then |
109 |
- rename so so_sav *.so && emake clean |
110 |
- emake libs "${GOTO_MAKEFLAGS[@]}" NEED_PIC= || die "emake static failed" |
111 |
- rename so_sav so *.so_sav |
112 |
- fi |
113 |
+ mkdir solibs |
114 |
+ emake libs shared && mv *.so solibs/ |
115 |
+ use static-libs && emake clean && emake libs NEED_PIC= |
116 |
} |
117 |
|
118 |
src_test() { |
119 |
- emake tests "${GOTO_MAKEFLAGS[@]}" || die "emake tests failed" |
120 |
+ emake tests |
121 |
} |
122 |
|
123 |
src_install() { |
124 |
- local libname=goto2 |
125 |
- mv $(readlink lib${libname}.so) lib${libname}.so |
126 |
- dolib.so lib${libname}.so || die "installing shared ${libname} failed" |
127 |
- if use static-libs; then |
128 |
- mv $(readlink lib${libname}.a) lib${libname}.a |
129 |
- dolib.a lib${libname}.a || die "installing static ${libname} failed" |
130 |
- fi |
131 |
+ local libname=goto2 threads |
132 |
+ use threads && threads="-pthread" |
133 |
+ dolib.so solibs/lib*.so |
134 |
+ use static-libs && dolib.a lib*.a |
135 |
+ |
136 |
# create pkg-config file and associated eselect file |
137 |
cat <<-EOF > ${libname}.pc |
138 |
- prefix="${EPREFIX}"/usr |
139 |
+ prefix=${EPREFIX}/usr |
140 |
libdir=\${prefix}/$(get_libdir) |
141 |
includedir=\${prefix}/include |
142 |
- |
143 |
Name: ${MYPN} |
144 |
Description: ${DESCRIPTION} |
145 |
Version: ${PV} |
146 |
URL: ${HOMEPAGE} |
147 |
- Libs: -L\${libdir} -l${libname} |
148 |
- Libs.private: -lm |
149 |
+ Libs: -L\${libdir} -l${libname} -lm ${threads} |
150 |
EOF |
151 |
+ insinto /usr/$(get_libdir)/pkgconfig |
152 |
+ doins ${libname}.pc |
153 |
+ |
154 |
alternatives_for blas goto2 0 \ |
155 |
"/usr/$(get_libdir)/pkgconfig/blas.pc" "${libname}.pc" |
156 |
|
157 |
@@ -108,7 +102,5 @@ src_install() { |
158 |
"/usr/$(get_libdir)/pkgconfig/cblas.pc" "${libname}.pc" \ |
159 |
"/usr/include/cblas.h" "${PN}/cblas.h" |
160 |
fi |
161 |
- insinto /usr/$(get_libdir)/pkgconfig |
162 |
- doins ${libname}.pc |
163 |
dodoc 01Readme.txt 03FAQ.txt 05LargePage 06WeirdPerformance |
164 |
} |