1 |
bicatali 12/05/30 00:29:47 |
2 |
|
3 |
Added: starpu-1.0.1-no-examples.patch |
4 |
starpu-1.0.1-system-blas.patch |
5 |
starpu-1.0.1-respect-cflags.patch |
6 |
starpu-1.0.1-no-pc-ldflags.patch |
7 |
Log: |
8 |
Initial import |
9 |
|
10 |
(Portage version: 2.1.10.63/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.1 dev-libs/starpu/files/starpu-1.0.1-no-examples.patch |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-no-examples.patch?rev=1.1&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-no-examples.patch?rev=1.1&content-type=text/plain |
17 |
|
18 |
Index: starpu-1.0.1-no-examples.patch |
19 |
=================================================================== |
20 |
--- Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100 |
21 |
+++ Makefile.am 2012-05-30 00:57:47.000000000 +0100 |
22 |
@@ -28,7 +28,9 @@ |
23 |
SUBDIRS += socl |
24 |
endif |
25 |
|
26 |
+if BUILD_EXAMPLES |
27 |
SUBDIRS += examples |
28 |
+endif |
29 |
|
30 |
if BUILD_GCC_PLUGIN |
31 |
SUBDIRS += gcc-plugin |
32 |
--- gcc-plugin/Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100 |
33 |
+++ gcc-plugin/Makefile.am 2012-05-30 00:59:39.000000000 +0100 |
34 |
@@ -13,7 +13,10 @@ |
35 |
# |
36 |
# See the GNU Lesser General Public License in COPYING.LGPL for more details. |
37 |
|
38 |
-SUBDIRS = src tests examples |
39 |
+SUBDIRS = src tests |
40 |
+if BUILD_EXAMPLES |
41 |
+SUBDIRS += examples |
42 |
+endif |
43 |
|
44 |
EXTRA_DIST = COPYING README ChangeLog |
45 |
|
46 |
--- configure.ac.orig 2012-05-29 23:30:19.000000000 +0100 |
47 |
+++ configure.ac 2012-05-30 01:17:48.000000000 +0100 |
48 |
@@ -1312,6 +1312,11 @@ |
49 |
# # |
50 |
############################################################################### |
51 |
|
52 |
+AC_ARG_ENABLE(build-examples, [AS_HELP_STRING([--enable-build-examples], |
53 |
+ [enable building of examples])], |
54 |
+ enable_build_examples=$enableval, enable_build_examples=no) |
55 |
+# check stuff for examples (todo) |
56 |
+AM_CONDITIONAL(BUILD_EXAMPLES, [test x$enable_build_examples != xno]) |
57 |
AC_ARG_ENABLE(opengl-render, [AS_HELP_STRING([--enable-opengl-render], |
58 |
[enable OpenGL rendering of some examples])], |
59 |
enable_opengl_render=$enableval, enable_opengl_render=no) |
60 |
@@ -1434,6 +1439,11 @@ |
61 |
if test x$use_system_blas = xyes; then |
62 |
AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library]) |
63 |
blas_lib=system |
64 |
+ elif test x"$BLAS_LIBS" != x; then |
65 |
+ AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library]) |
66 |
+ STARPU_BLAS_LDFLAGS="$BLAS_LIBS" |
67 |
+ AC_SUBST(STARPU_BLAS_LDFLAGS) |
68 |
+ blas_lib=system |
69 |
else |
70 |
blas_lib=none |
71 |
fi |
72 |
--- mpi/Makefile.a.origm 2012-05-29 23:16:20.000000000 +0100 |
73 |
+++ mpi/Makefile.am 2012-05-30 01:20:49.000000000 +0100 |
74 |
@@ -94,7 +94,7 @@ |
75 |
################### |
76 |
# Stencil example # |
77 |
################### |
78 |
- |
79 |
+if BUILD_EXAMPLES |
80 |
examplebin_PROGRAMS += \ |
81 |
examples/stencil/stencil5 |
82 |
|
83 |
@@ -202,7 +202,7 @@ |
84 |
|
85 |
check_PROGRAMS += \ |
86 |
examples/reduction/mpi_reduction |
87 |
- |
88 |
+endif |
89 |
######################## |
90 |
# Unit testcases # |
91 |
######################## |
92 |
--- starpufft/Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100 |
93 |
+++ starpufft/Makefile.am 2012-05-30 01:23:40.000000000 +0100 |
94 |
@@ -67,10 +67,13 @@ |
95 |
endif |
96 |
|
97 |
examplebindir = $(libdir)/starpu/examples/starpufft |
98 |
-examplebin_PROGRAMS = \ |
99 |
+ |
100 |
+examplebin_PROGRAMS = |
101 |
+if BUILD_EXAMPLES |
102 |
+examplebin_PROGRAMS += \ |
103 |
examples/testf \ |
104 |
examples/test |
105 |
- |
106 |
+endif |
107 |
check_PROGRAMS = examples/testf |
108 |
examples_testf_LDADD = libstarpufft-@STARPU_EFFECTIVE_VERSION@.la $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(FFTWF_LIBS) |
109 |
|
110 |
|
111 |
|
112 |
|
113 |
1.1 dev-libs/starpu/files/starpu-1.0.1-system-blas.patch |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-system-blas.patch?rev=1.1&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-system-blas.patch?rev=1.1&content-type=text/plain |
117 |
|
118 |
Index: starpu-1.0.1-system-blas.patch |
119 |
=================================================================== |
120 |
--- starpu-1.0.1/configure.ac.orig 2012-05-29 23:30:19.000000000 +0100 |
121 |
+++ starpu-1.0.1/configure.ac 2012-05-30 00:02:22.000000000 +0100 |
122 |
@@ -1434,6 +1434,11 @@ |
123 |
if test x$use_system_blas = xyes; then |
124 |
AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library]) |
125 |
blas_lib=system |
126 |
+ elif test x"$BLAS_LIBS" != x; then |
127 |
+ AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library]) |
128 |
+ STARPU_BLAS_LDFLAGS="$BLAS_LIBS" |
129 |
+ AC_SUBST(STARPU_BLAS_LDFLAGS) |
130 |
+ blas_lib=system |
131 |
else |
132 |
blas_lib=none |
133 |
fi |
134 |
|
135 |
|
136 |
|
137 |
1.1 dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch |
138 |
|
139 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch?rev=1.1&view=markup |
140 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-respect-cflags.patch?rev=1.1&content-type=text/plain |
141 |
|
142 |
Index: starpu-1.0.1-respect-cflags.patch |
143 |
=================================================================== |
144 |
--- configure.ac.orig 2012-05-29 23:16:20.000000000 +0100 |
145 |
+++ configure.ac 2012-05-29 23:20:48.000000000 +0100 |
146 |
@@ -773,8 +773,6 @@ |
147 |
if test x$enable_debug = xyes; then |
148 |
CFLAGS="$CFLAGS -O0" |
149 |
AC_DEFINE(STARPU_SPINLOCK_CHECK, [1], [check spinlock use]) |
150 |
-else |
151 |
- CFLAGS="$CFLAGS -O3" |
152 |
fi |
153 |
CFLAGS+=" -gdwarf-2 -g3 " |
154 |
|
155 |
|
156 |
|
157 |
|
158 |
1.1 dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch |
159 |
|
160 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch?rev=1.1&view=markup |
161 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/starpu/files/starpu-1.0.1-no-pc-ldflags.patch?rev=1.1&content-type=text/plain |
162 |
|
163 |
Index: starpu-1.0.1-no-pc-ldflags.patch |
164 |
=================================================================== |
165 |
--- libstarpu.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
166 |
+++ libstarpu.pc.in 2012-05-30 01:09:41.000000000 +0100 |
167 |
@@ -24,6 +24,6 @@ |
168 |
Version: @PACKAGE_VERSION@ |
169 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API |
170 |
Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@ |
171 |
-Libs.private: @LDFLAGS@ @LIBS@ |
172 |
+Libs.private: @LIBS@ |
173 |
Requires: @HWLOC_REQUIRES@ |
174 |
Requires.private: @GORDON_REQUIRES@ |
175 |
--- mpi/libstarpumpi.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
176 |
+++ mpi/libstarpumpi.pc.in 2012-05-30 01:09:53.000000000 +0100 |
177 |
@@ -24,6 +24,6 @@ |
178 |
Version: @PACKAGE_VERSION@ |
179 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ -DSTARPU_USE_DEPRECATED_API |
180 |
Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@ |
181 |
-Libs.private: @LDFLAGS@ @LIBS@ |
182 |
+Libs.private: @LIBS@ |
183 |
Requires: libstarpu |
184 |
Requires.private: |
185 |
--- mpi/starpumpi-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
186 |
+++ mpi/starpumpi-1.0.pc.in 2012-05-30 01:10:11.000000000 +0100 |
187 |
@@ -24,6 +24,6 @@ |
188 |
Version: @PACKAGE_VERSION@ |
189 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ |
190 |
Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@ |
191 |
-Libs.private: @LDFLAGS@ @LIBS@ |
192 |
+Libs.private: @LIBS@ |
193 |
Requires: starpu-1.0 |
194 |
Requires.private: |
195 |
--- starpufft/starpufft-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
196 |
+++ starpufft/starpufft-1.0.pc.in 2012-05-30 01:10:25.000000000 +0100 |
197 |
@@ -24,4 +24,4 @@ |
198 |
Version: @PACKAGE_VERSION@ |
199 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ |
200 |
Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@ |
201 |
-Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@ |
202 |
+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@ |
203 |
--- starpufft/libstarpufft.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
204 |
+++ starpufft/libstarpufft.pc.in 2012-05-30 01:10:43.000000000 +0100 |
205 |
@@ -24,4 +24,4 @@ |
206 |
Version: @PACKAGE_VERSION@ |
207 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API |
208 |
Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@ |
209 |
-Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@ |
210 |
+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@ |
211 |
--- starpu-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
212 |
+++ starpu-1.0.pc.in 2012-05-30 01:11:06.000000000 +0100 |
213 |
@@ -30,6 +30,6 @@ |
214 |
Version: @PACKAGE_VERSION@ |
215 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ |
216 |
Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@ |
217 |
-Libs.private: @LDFLAGS@ @LIBS@ |
218 |
+Libs.private: @LIBS@ |
219 |
Requires: @HWLOC_REQUIRES@ |
220 |
Requires.private: @GORDON_REQUIRES@ |
221 |
--- socl/socl-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100 |
222 |
+++ socl/socl-1.0.pc.in 2012-05-30 01:11:19.000000000 +0100 |
223 |
@@ -24,6 +24,6 @@ |
224 |
Version: @PACKAGE_VERSION@ |
225 |
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@/socl |
226 |
Libs: -L${libdir} -lsocl-@STARPU_EFFECTIVE_VERSION@ |
227 |
-Libs.private: @LDFLAGS@ @LIBS@ |
228 |
+Libs.private: @LIBS@ |
229 |
Requires: starpu-1.0 |
230 |
Requires.private: |