[gentoo-commits] dev/bicatali:master commit in: sci-libs/mumps/ - gentoo-commits

From:	Sebastien Fabbro <bicatali@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] dev/bicatali:master commit in: sci-libs/mumps/
Date:	Wed, 01 Jun 2011 17:36:05
Message-Id:	`04c685da930bc22610aa1832c926de4e50deeaec.bicatali@gentoo`

1

commit:     04c685da930bc22610aa1832c926de4e50deeaec

2

Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>

3

AuthorDate: Wed Jun  1 17:24:54 2011 +0000

4

Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>

5

CommitDate: Wed Jun  1 17:24:54 2011 +0000

6

URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=04c685da

7

8

more sed fixes. shared libs work. all tested

9

10

---

11

 sci-libs/mumps/Manifest            |    2 +-

12

 sci-libs/mumps/mumps-4.10.0.ebuild |   69 +++++++++++++++++++----------------

13

 2 files changed, 38 insertions(+), 33 deletions(-)

14

15

diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest

16

index 26ea77c..4c73a34 100644

17

--- a/sci-libs/mumps/Manifest

18

+++ b/sci-libs/mumps/Manifest

19

@@ -1,4 +1,4 @@

20

 DIST MUMPS_4.10.0.tar.gz 2481516 RMD160 19ae1f4773ab1643237f791085d9721932a618fc SHA1 904b1d816272d99f1f53913cbd4789a5be1838f7 SHA256 d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933

21

-EBUILD mumps-4.10.0.ebuild 3916 RMD160 548e678b07694d7b6700a5c4f5b3000d6eff4384 SHA1 331c64cd824ca69e0006de7c493cbdce36f67b5b SHA256 51a4df8dda86e81f2056293985d367e39e661389c4dc0b62c45e6edba0e07afb

22

+EBUILD mumps-4.10.0.ebuild 4131 RMD160 173f734b257b0735b2bd087640492eb736396ab6 SHA1 24b89639ef668e655ce2d8a679c9b01a513eda58 SHA256 7da9efed2f768937e0ff8bc295dab3d62d719b2bd710415d02c41a32bcf9e16e

23

 MISC ChangeLog 256 RMD160 4934775c75859634f7e502286e5f6c607ebd0c43 SHA1 3b8a5223cd6c7f1f293786a62156653efb194766 SHA256 95c92bfc19f31e1e498b62026b7f39570700efbbe791bdfe376dca85b20f9024

24

 MISC metadata.xml 550 RMD160 4d8730ab11dca7f0e70958c24413643d5fe6470c SHA1 e54d1d1c396292d36faa321e49d8adcc41fba07b SHA256 6283620deb195a65aaabb4dff6f3dfd05f0550ec6c108d497bdcbf4c6ea6765d

25

26

diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild

27

index 59c2ae3..58844ed 100644

28

--- a/sci-libs/mumps/mumps-4.10.0.ebuild

29

+++ b/sci-libs/mumps/mumps-4.10.0.ebuild

30

@@ -3,7 +3,7 @@

31

 # $Header: $

32

33

 EAPI=4

34

-inherit eutils toolchain-funcs flag-o-matic

35

+inherit eutils toolchain-funcs flag-o-matic versionator

36

37

 MYP=MUMPS_${PV}

38

39

@@ -35,72 +35,73 @@ make_shared_lib() {

40

 		-shared -Wl,-soname="${soname}" \

41

 		-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \

42

 		"$@" -o $(dirname "${libstatic}")/"${soname}" || die "${soname} failed"

43

+	ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"

44

}

45

46

 src_prepare() {

47

-	sed -e "s:\(CC\s*=\).*:\1$(tc-getCC):" \

48

-		-e "s:\(FC\s*=\).*:\1$(tc-getFC):" \

49

-		-e "s:\(FL\s*=\).*:\1$(tc-getFC):" \

50

-		-e "s:\(AR\s*=\).*:\1$(tc-getAR) rv :" \

51

-		-e "s:\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \

52

-		-e "s:\(LIBBLAS\s*=\).*:\1$(pkg-config --libs blas):" \

53

-		-e "s:\(INCPAR\s*=\).*:\1:" \

54

-		-e 's:\(LIBPAR\s*=\).*:\1$(SCALAP):' \

55

-		-e "s:\(OPTF\s*=\).*:\1${FFLAGS}:" \

56

-		-e "s:\(OPTC\s*=\).*:\1${CFLAGS}:" \

57

-		-e "s:\(OPTL\s*=\).*:\1${LDFLAGS}:" \

58

+	sed -e "s:^\(CC\s*=\).*:\1$(tc-getCC):" \

59

+		-e "s:^\(FC\s*=\).*:\1$(tc-getFC):" \

60

+		-e "s:^\(FL\s*=\).*:\1$(tc-getFC):" \

61

+		-e "s:^\(AR\s*=\).*:\1$(tc-getAR) rv :" \

62

+		-e "s:^\(RANLIB\s*=\).*:\1$(tc-getRANLIB):" \

63

+		-e "s:^\(LIBBLAS\s*=\).*:\1$(pkg-config --libs blas):" \

64

+		-e "s:^\(INCPAR\s*=\).*:\1:" \

65

+		-e 's:^\(LIBPAR\s*=\).*:\1$(SCALAP):' \

66

+		-e "s:^\(OPTF\s*=\).*:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \

67

+		-e "s:^\(OPTC\s*=\).*:\1${CFLAGS} \$(PIC):" \

68

+		-e "s:^\(OPTL\s*=\).*:\1${LDFLAGS}:" \

69

 		Make.inc/Makefile.inc.generic > Makefile.inc || die

70

}

71

72

 src_configure() {

73

-	LIBS="$(pkg-config --libs blas) -Llib -lpord"

74

+	LIBADD="$(pkg-config --libs blas) -Llib -lpord"

75

 	local ord="-Dpord"

76

 	if use metis && use mpi; then

77

 		sed -i \

78

 			-e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs metis-mpi):" \

79

 			-e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags metis-mpi):" \

80

 			Makefile.inc || die

81

-		LIBS="${LIBS} $(pkg-config --libs metis-mpi)"

82

+		LIBADD="${LIBADD} $(pkg-config --libs metis-mpi)"

83

 		ord="${ord} -Dparmetis"

84

 	elif use metis; then

85

 		sed -i \

86

 			-e "s:#\s*\(LMETIS\s*=\).*:\1$(pkg-config --libs metis):" \

87

 			-e "s:#\s*\(IMETIS\s*=\).*:\1$(pkg-config --cflags metis):" \

88

 			Makefile.inc || die

89

-		LIBS="${LIBS} $(pkg-config --libs metis)"

90

+		LIBADD="${LIBADD} $(pkg-config --libs metis)"

91

 		ord="${ord} -Dmetis"

92

fi

93

 	if use scotch && use mpi; then

94

 		sed -i \

95

-			-e "s:\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \

96

-			-e "s:\(ISCOTCH\s*=\).*:\1${ED}/usr/include/scotch:" \

97

+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \

98

+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \

99

 			Makefile.inc || die

100

-		LIBS="${LIBS} -lptesmumps -lptscotch -lptscotcherr"

101

+		LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"

102

 		ord="${ord} -Dptscotch"

103

 	elif use scotch; then

104

 		sed -i \

105

-			-e "s:\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \

106

-			-e "s:\(ISCOTCH\s*=\).*:\1${ED}/usr/include/scotch:" \

107

+			-e "s:#\s*\(LSCOTCH\s*=\).*:\1-lesmumps -lscotch -lscotcherr:" \

108

+			-e "s:#\s*\(ISCOTCH\s*=\).*:\1-I${EROOT}usr/include/scotch:" \

109

 			Makefile.inc || die

110

-		LIBS="${LIBS} -lesmumps -lscotch -lscotcherr"

111

+		LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"

112

 		ord="${ord} -Dscotch"

113

fi

114

 	if use mpi; then

115

 		sed -i \

116

-			-e "s:\(CC\s*=\).*:\1mpicc:" \

117

-			-e "s:\(FC\s*=\).*:\1mpif90:" \

118

-			-e "s:\(FL\s*=\).*:\1mpif90:" \

119

-			-e "s:\(SCALAP\s*=\).*:\1$(pkg-config --libs scalapack):" \

120

+			-e "s:^\(CC\s*=\).*:\1mpicc:" \

121

+			-e "s:^\(FC\s*=\).*:\1mpif90:" \

122

+			-e "s:^\(FL\s*=\).*:\1mpif90:" \

123

+			-e "s:^\(SCALAP\s*=\).*:\1$(pkg-config --libs scalapack):" \

124

 			Makefile.inc || die

125

 		export LINK=mpif90

126

-		LIBS="${LIBS} $(pkg-config --libs scalapack)"

127

+		LIBADD="${LIBADD} $(pkg-config --libs scalapack)"

128

fi

129

-	sed -i -e "s:\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die

130

+	sed -i -e "s:^\s*\(ORDERINGSF\s*=\).*:\1 ${ord}:" Makefile.inc || die

131

}

132

133

 src_compile() {

134

-	emake alllib OPTF="${FFLAGS} -fPIC" OPTC="${CFLAGS} -fPIC"

135

-	make_shared_lib lib/libmumps_common.a ${LIBS}

136

+	emake alllib PIC="-fPIC"

137

+	make_shared_lib lib/libmumps_common.a ${LIBADD}

138

 	local i

139

 	for i in c d s z; do

140

 		make_shared_lib lib/lib${i}mumps.a -Llib -lmumps_common

141

@@ -115,18 +116,22 @@ src_test() {

142

 	emake all

143

 	local dotest

144

 	use mpi && dotest="mpirun -np 2"

145

+	cd examples

146

 	${dotest} ./ssimpletest < input_simpletest_real || die

147

 	${dotest} ./dsimpletest < input_simpletest_real || die

148

 	${dotest} ./csimpletest < input_simpletest_cmplx || die

149

 	${dotest} ./zsimpletest < input_simpletest_cmplx || die

150

-	einfo "The solution should be (1,2,3,4,5)"

151

+	einfo "The solutions should be close to (1,2,3,4,5)"

152

 	${dotest} ./c_example || die

153

-	einfo "The solution should be (1,2)"

154

+	einfo "The solution should be close to (1,2)"

155

+	make clean

156

}

157

158

 src_install() {

159

-	dolib.so lib/lib*.so

160

+	dolib.so lib/lib*.so*

161

 	use static-libs && dolib.a lib/lib*.a

162

+	insinto /usr

163

+	doins -r include

164

 	dodoc README ChangeLog VERSION

165

 	use doc && dodoc doc/*.pdf

166

 	if use examples; then

1	commit: 04c685da930bc22610aa1832c926de4e50deeaec
2	Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3	AuthorDate: Wed Jun 1 17:24:54 2011 +0000
4	Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5	CommitDate: Wed Jun 1 17:24:54 2011 +0000
6	URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=04c685da
7
8	more sed fixes. shared libs work. all tested
9
10	---
11	sci-libs/mumps/Manifest \| 2 +-
12	sci-libs/mumps/mumps-4.10.0.ebuild \| 69 +++++++++++++++++++----------------
13	2 files changed, 38 insertions(+), 33 deletions(-)
14
15	diff --git a/sci-libs/mumps/Manifest b/sci-libs/mumps/Manifest
16	index 26ea77c..4c73a34 100644
17	--- a/sci-libs/mumps/Manifest
18	+++ b/sci-libs/mumps/Manifest
19	@@ -1,4 +1,4 @@
20	DIST MUMPS_4.10.0.tar.gz 2481516 RMD160 19ae1f4773ab1643237f791085d9721932a618fc SHA1 904b1d816272d99f1f53913cbd4789a5be1838f7 SHA256 d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933
21	-EBUILD mumps-4.10.0.ebuild 3916 RMD160 548e678b07694d7b6700a5c4f5b3000d6eff4384 SHA1 331c64cd824ca69e0006de7c493cbdce36f67b5b SHA256 51a4df8dda86e81f2056293985d367e39e661389c4dc0b62c45e6edba0e07afb
22	+EBUILD mumps-4.10.0.ebuild 4131 RMD160 173f734b257b0735b2bd087640492eb736396ab6 SHA1 24b89639ef668e655ce2d8a679c9b01a513eda58 SHA256 7da9efed2f768937e0ff8bc295dab3d62d719b2bd710415d02c41a32bcf9e16e
23	MISC ChangeLog 256 RMD160 4934775c75859634f7e502286e5f6c607ebd0c43 SHA1 3b8a5223cd6c7f1f293786a62156653efb194766 SHA256 95c92bfc19f31e1e498b62026b7f39570700efbbe791bdfe376dca85b20f9024
24	MISC metadata.xml 550 RMD160 4d8730ab11dca7f0e70958c24413643d5fe6470c SHA1 e54d1d1c396292d36faa321e49d8adcc41fba07b SHA256 6283620deb195a65aaabb4dff6f3dfd05f0550ec6c108d497bdcbf4c6ea6765d
25
26	diff --git a/sci-libs/mumps/mumps-4.10.0.ebuild b/sci-libs/mumps/mumps-4.10.0.ebuild
27	index 59c2ae3..58844ed 100644
28	--- a/sci-libs/mumps/mumps-4.10.0.ebuild
29	+++ b/sci-libs/mumps/mumps-4.10.0.ebuild
30	@@ -3,7 +3,7 @@
31	# $Header: $
32
33	EAPI=4
34	-inherit eutils toolchain-funcs flag-o-matic
35	+inherit eutils toolchain-funcs flag-o-matic versionator
36
37	MYP=MUMPS_${PV}
38
39	@@ -35,72 +35,73 @@ make_shared_lib() {
40	-shared -Wl,-soname="${soname}" \
41	-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
42	"$@" -o $(dirname "${libstatic}")/"${soname}" \|\| die "${soname} failed"
43	+ ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
44	}
45
46	src_prepare() {
47	- sed -e "s:\(CC\s=\).:\1$(tc-getCC):" \
48	- -e "s:\(FC\s=\).:\1$(tc-getFC):" \
49	- -e "s:\(FL\s=\).:\1$(tc-getFC):" \
50	- -e "s:\(AR\s=\).:\1$(tc-getAR) rv :" \
51	- -e "s:\(RANLIB\s=\).:\1$(tc-getRANLIB):" \
52	- -e "s:\(LIBBLAS\s=\).:\1$(pkg-config --libs blas):" \
53	- -e "s:\(INCPAR\s=\).:\1:" \
54	- -e 's:\(LIBPAR\s=\).:\1$(SCALAP):' \
55	- -e "s:\(OPTF\s=\).:\1${FFLAGS}:" \
56	- -e "s:\(OPTC\s=\).:\1${CFLAGS}:" \
57	- -e "s:\(OPTL\s=\).:\1${LDFLAGS}:" \
58	+ sed -e "s:^\(CC\s=\).:\1$(tc-getCC):" \
59	+ -e "s:^\(FC\s=\).:\1$(tc-getFC):" \
60	+ -e "s:^\(FL\s=\).:\1$(tc-getFC):" \
61	+ -e "s:^\(AR\s=\).:\1$(tc-getAR) rv :" \
62	+ -e "s:^\(RANLIB\s=\).:\1$(tc-getRANLIB):" \
63	+ -e "s:^\(LIBBLAS\s=\).:\1$(pkg-config --libs blas):" \
64	+ -e "s:^\(INCPAR\s=\).:\1:" \
65	+ -e 's:^\(LIBPAR\s=\).:\1$(SCALAP):' \
66	+ -e "s:^\(OPTF\s=\).:\1${FFLAGS} -DALLOW_NON_INIT \$(PIC):" \
67	+ -e "s:^\(OPTC\s=\).:\1${CFLAGS} \$(PIC):" \
68	+ -e "s:^\(OPTL\s=\).:\1${LDFLAGS}:" \
69	Make.inc/Makefile.inc.generic > Makefile.inc \|\| die
70	}
71
72	src_configure() {
73	- LIBS="$(pkg-config --libs blas) -Llib -lpord"
74	+ LIBADD="$(pkg-config --libs blas) -Llib -lpord"
75	local ord="-Dpord"
76	if use metis && use mpi; then
77	sed -i \
78	-e "s:#\s\(LMETIS\s=\).*:\1$(pkg-config --libs metis-mpi):" \
79	-e "s:#\s\(IMETIS\s=\).*:\1$(pkg-config --cflags metis-mpi):" \
80	Makefile.inc \|\| die
81	- LIBS="${LIBS} $(pkg-config --libs metis-mpi)"
82	+ LIBADD="${LIBADD} $(pkg-config --libs metis-mpi)"
83	ord="${ord} -Dparmetis"
84	elif use metis; then
85	sed -i \
86	-e "s:#\s\(LMETIS\s=\).*:\1$(pkg-config --libs metis):" \
87	-e "s:#\s\(IMETIS\s=\).*:\1$(pkg-config --cflags metis):" \
88	Makefile.inc \|\| die
89	- LIBS="${LIBS} $(pkg-config --libs metis)"
90	+ LIBADD="${LIBADD} $(pkg-config --libs metis)"
91	ord="${ord} -Dmetis"
92	fi
93	if use scotch && use mpi; then
94	sed -i \
95	- -e "s:\(LSCOTCH\s=\).:\1-lptesmumps -lptscotch -lptscotcherr:" \
96	- -e "s:\(ISCOTCH\s=\).:\1${ED}/usr/include/scotch:" \
97	+ -e "s:#\s\(LSCOTCH\s=\).*:\1-lptesmumps -lptscotch -lptscotcherr:" \
98	+ -e "s:#\s\(ISCOTCH\s=\).*:\1-I${EROOT}usr/include/scotch:" \
99	Makefile.inc \|\| die
100	- LIBS="${LIBS} -lptesmumps -lptscotch -lptscotcherr"
101	+ LIBADD="${LIBADD} -lptesmumps -lptscotch -lptscotcherr"
102	ord="${ord} -Dptscotch"
103	elif use scotch; then
104	sed -i \
105	- -e "s:\(LSCOTCH\s=\).:\1-lesmumps -lscotch -lscotcherr:" \
106	- -e "s:\(ISCOTCH\s=\).:\1${ED}/usr/include/scotch:" \
107	+ -e "s:#\s\(LSCOTCH\s=\).*:\1-lesmumps -lscotch -lscotcherr:" \
108	+ -e "s:#\s\(ISCOTCH\s=\).*:\1-I${EROOT}usr/include/scotch:" \
109	Makefile.inc \|\| die
110	- LIBS="${LIBS} -lesmumps -lscotch -lscotcherr"
111	+ LIBADD="${LIBADD} -lesmumps -lscotch -lscotcherr"
112	ord="${ord} -Dscotch"
113	fi
114	if use mpi; then
115	sed -i \
116	- -e "s:\(CC\s=\).:\1mpicc:" \
117	- -e "s:\(FC\s=\).:\1mpif90:" \
118	- -e "s:\(FL\s=\).:\1mpif90:" \
119	- -e "s:\(SCALAP\s=\).:\1$(pkg-config --libs scalapack):" \
120	+ -e "s:^\(CC\s=\).:\1mpicc:" \
121	+ -e "s:^\(FC\s=\).:\1mpif90:" \
122	+ -e "s:^\(FL\s=\).:\1mpif90:" \
123	+ -e "s:^\(SCALAP\s=\).:\1$(pkg-config --libs scalapack):" \
124	Makefile.inc \|\| die
125	export LINK=mpif90
126	- LIBS="${LIBS} $(pkg-config --libs scalapack)"
127	+ LIBADD="${LIBADD} $(pkg-config --libs scalapack)"
128	fi
129	- sed -i -e "s:\(ORDERINGSF\s=\).:\1 ${ord}:" Makefile.inc \|\| die
130	+ sed -i -e "s:^\s\(ORDERINGSF\s=\).*:\1 ${ord}:" Makefile.inc \|\| die
131	}
132
133	src_compile() {
134	- emake alllib OPTF="${FFLAGS} -fPIC" OPTC="${CFLAGS} -fPIC"
135	- make_shared_lib lib/libmumps_common.a ${LIBS}
136	+ emake alllib PIC="-fPIC"
137	+ make_shared_lib lib/libmumps_common.a ${LIBADD}
138	local i
139	for i in c d s z; do
140	make_shared_lib lib/lib${i}mumps.a -Llib -lmumps_common
141	@@ -115,18 +116,22 @@ src_test() {
142	emake all
143	local dotest
144	use mpi && dotest="mpirun -np 2"
145	+ cd examples
146	${dotest} ./ssimpletest < input_simpletest_real \|\| die
147	${dotest} ./dsimpletest < input_simpletest_real \|\| die
148	${dotest} ./csimpletest < input_simpletest_cmplx \|\| die
149	${dotest} ./zsimpletest < input_simpletest_cmplx \|\| die
150	- einfo "The solution should be (1,2,3,4,5)"
151	+ einfo "The solutions should be close to (1,2,3,4,5)"
152	${dotest} ./c_example \|\| die
153	- einfo "The solution should be (1,2)"
154	+ einfo "The solution should be close to (1,2)"
155	+ make clean
156	}
157
158	src_install() {
159	- dolib.so lib/lib*.so
160	+ dolib.so lib/lib.so
161	use static-libs && dolib.a lib/lib*.a
162	+ insinto /usr
163	+ doins -r include
164	dodoc README ChangeLog VERSION
165	use doc && dodoc doc/*.pdf
166	if use examples; then

Gentoo Archives: gentoo-commits