Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sebastien Fabbro <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/bicatali:master commit in: sci-libs/adolc/files/, sci-libs/adolc/
Date: Thu, 31 Mar 2011 18:11:56
Message-Id: 3d9d99e96d42ae64db4b2384b71503599867c762.bicatali@gentoo
1 commit: 3d9d99e96d42ae64db4b2384b71503599867c762
2 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 04:53:29 2011 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 04:53:29 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=3d9d99e9
7
8 added adolc
9
10 ---
11 sci-libs/adolc/ChangeLog | 11 +
12 sci-libs/adolc/Manifest | 6 +
13 sci-libs/adolc/adolc-2.1.12.ebuild | 39 ++
14 sci-libs/adolc/files/adolc-2.1.12-autotools.patch | 460 ++++++++++++++++++++
15 .../adolc/files/adolc-2.1.12-sparse-openmp.patch | 20 +
16 sci-libs/adolc/metadata.xml | 11 +
17 6 files changed, 547 insertions(+), 0 deletions(-)
18
19 diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
20 new file mode 100644
21 index 0000000..f24a320
22 --- /dev/null
23 +++ b/sci-libs/adolc/ChangeLog
24 @@ -0,0 +1,11 @@
25 +# ChangeLog for sci-libs/adolc
26 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 +# $Header: $
28 +
29 +*adolc-2.1.12 (30 Mar 2011)
30 +
31 + 30 Mar 2011; Sébastien Fabbro <bicatali@g.o> +adolc-2.1.12.ebuild,
32 + +files/adolc-2.1.12-autotools.patch, +files/adolc-2.1.12-sparse-openmp.patch,
33 + +metadata.xml:
34 + Initial import
35 +
36
37 diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest
38 new file mode 100644
39 index 0000000..5bc0585
40 --- /dev/null
41 +++ b/sci-libs/adolc/Manifest
42 @@ -0,0 +1,6 @@
43 +AUX adolc-2.1.12-autotools.patch 14607 RMD160 756283a1d5e33a1b3c38cde50bf476f99ef7f91f SHA1 a07030bd8d221b8173a50125730d79cbc4ef3a9f SHA256 b174a428121d52c2fa8bfe7663585b6c3606d0e428da876db966b16a6f15cdbf
44 +AUX adolc-2.1.12-sparse-openmp.patch 697 RMD160 198842380b04cb602e16d0b98cf2869de66c51c2 SHA1 910fc4f27287d2236394d0b62238e4becf0518b3 SHA256 522a34c9ac434240e55e97fca7ae7b1ae3474e06131c42bdb918965944bb86b8
45 +DIST ADOL-C-2.1.12.tgz 12875303 RMD160 ef0fcaca67d12d137215a42eca8e3afde8bedd41 SHA1 4f760a5b281e7c1a1763351b89ea1351955f9de5 SHA256 38978f8c97a640d15f649cc81da68530863b5f1ac1932dca6035d781503b21f1
46 +EBUILD adolc-2.1.12.ebuild 808 RMD160 5ed768a3bdc219d325f9be3034134e6c848716be SHA1 bff46bbcbf0201e298d854e5459697705cb5cd96 SHA256 97a86a6e597f840cd86c88b018c7aaa85d47e2be7d164e6d4493a782f1b3deb7
47 +MISC ChangeLog 336 RMD160 8d32da58c16fcf436a4f89ae26355711f21ecf86 SHA1 5d23cef61d21d846c0b90ffba82bcffddf35a801 SHA256 380d9e7e87577e19c6997fe0374de50c312ab89adb5b4feef0cc55e37a5c2a84
48 +MISC metadata.xml 427 RMD160 95c85f303e6883ba7546e9b659db29f14360f195 SHA1 f664d5f8f3141e597384a2712a6dc702d55c7654 SHA256 dbccbfff23b0d47223a5098ee2aae71b87ce0373de80183767f39db667722396
49
50 diff --git a/sci-libs/adolc/adolc-2.1.12.ebuild b/sci-libs/adolc/adolc-2.1.12.ebuild
51 new file mode 100644
52 index 0000000..f2fde06
53 --- /dev/null
54 +++ b/sci-libs/adolc/adolc-2.1.12.ebuild
55 @@ -0,0 +1,39 @@
56 +# Copyright 1999-2011 Gentoo Foundation
57 +# Distributed under the terms of the GNU General Public License v2
58 +# $Header: $
59 +
60 +EAPI=4
61 +inherit eutils autotools
62 +
63 +MYPN=ADOL-C
64 +
65 +DESCRIPTION="Automatic differentiation system for C/C++"
66 +HOMEPAGE="https://projects.coin-or.org/ADOL-C/"
67 +SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz"
68 +
69 +LICENSE="|| ( CPL GPL-2 )"
70 +SLOT="0"
71 +KEYWORDS="~amd64 ~x86"
72 +IUSE="examples openmp sparse static-libs"
73 +
74 +RDEPEND="sparse? ( sci-libs/colpack )"
75 +DEPEND="${RDEPEND}"
76 +
77 +S=${WORKDIR}/${MYPN}-${PV}
78 +
79 +src_prepare() {
80 + epatch "${FILESDIR}"/${P}-autotools.patch
81 + epatch "${FILESDIR}"/${P}-sparse-openmp.patch
82 + eautoreconf
83 +}
84 +
85 +src_configure() {
86 + econf \
87 + $(use_enable openmp) \
88 + $(use_enable static-libs static) \
89 + $(use_with sparse colpack)
90 +}
91 +
92 +src_test() {
93 + emake test
94 +}
95
96 diff --git a/sci-libs/adolc/files/adolc-2.1.12-autotools.patch b/sci-libs/adolc/files/adolc-2.1.12-autotools.patch
97 new file mode 100644
98 index 0000000..b23b64c
99 --- /dev/null
100 +++ b/sci-libs/adolc/files/adolc-2.1.12-autotools.patch
101 @@ -0,0 +1,460 @@
102 +diff -Nur ADOL-C-2.1.12.orig/ADOL-C/src/Makefile.am ADOL-C-2.1.12/ADOL-C/src/Makefile.am
103 +--- ADOL-C-2.1.12.orig/ADOL-C/src/Makefile.am 2011-03-28 00:28:00.000000000 +0100
104 ++++ ADOL-C-2.1.12/ADOL-C/src/Makefile.am 2011-03-30 05:49:17.000000000 +0100
105 +@@ -19,7 +19,6 @@
106 + endif
107 +
108 + AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C
109 +-
110 + INCLUDES = -I$(top_builddir)/ADOL-C
111 +
112 + if SPARSE
113 +@@ -63,8 +62,7 @@
114 + int_reverse_s.c int_reverse_t.c
115 +
116 + libadolc_la_LIBADD = drivers/libdrivers.la sparse/libsparse.la \
117 +- tapedoc/libtapedoc.la
118 +-libadolc_la_LDFLAGS += @COLPACK_LIBS@
119 ++ tapedoc/libtapedoc.la @COLPACK_LIBS@
120 + else
121 + libadolc_la_SOURCES = adalloc.c malloc.c adouble.cpp \
122 + convolut.c fortutils.c\
123 +diff -Nur ADOL-C-2.1.12.orig/ADOL-C/test/Makefile.am ADOL-C-2.1.12/ADOL-C/test/Makefile.am
124 +--- ADOL-C-2.1.12.orig/ADOL-C/test/Makefile.am 2011-03-28 00:28:00.000000000 +0100
125 ++++ ADOL-C-2.1.12/ADOL-C/test/Makefile.am 2011-03-30 04:45:33.000000000 +0100
126 +@@ -10,7 +10,7 @@
127 + ##
128 + ##############################################################################
129 +
130 +-noinst_PROGRAMS = powexam speelpenning fminmax
131 ++check_PROGRAMS = powexam speelpenning fminmax
132 +
133 + speelpenning_SOURCES = speelpenning.cpp
134 +
135 +diff -Nur ADOL-C-2.1.12.orig/config.log ADOL-C-2.1.12/config.log
136 +--- ADOL-C-2.1.12.orig/config.log 1970-01-01 01:00:00.000000000 +0100
137 ++++ ADOL-C-2.1.12/config.log 2011-03-30 05:39:48.000000000 +0100
138 +@@ -0,0 +1,288 @@
139 ++This file contains any messages produced by compilers while
140 ++running configure, to aid debugging if configure makes a mistake.
141 ++
142 ++It was created by adolc configure 2.1.12, which was
143 ++generated by GNU Autoconf 2.65. Invocation command line was
144 ++
145 ++ $ ./configure
146 ++
147 ++## --------- ##
148 ++## Platform. ##
149 ++## --------- ##
150 ++
151 ++hostname = cayenne.ist.utl.pt
152 ++uname -m = x86_64
153 ++uname -r = 2.6.29-gentoo-r6
154 ++uname -s = Linux
155 ++uname -v = #1 SMP PREEMPT Thu May 27 17:13:20 WEST 2010
156 ++
157 ++/usr/bin/uname -p = Quad-Core AMD Opteron(tm) Processor 8354
158 ++/bin/uname -X = unknown
159 ++
160 ++/bin/arch = unknown
161 ++/usr/bin/arch -k = unknown
162 ++/usr/convex/getsysinfo = unknown
163 ++/usr/bin/hostinfo = unknown
164 ++/bin/machine = unknown
165 ++/usr/bin/oslevel = unknown
166 ++/bin/universe = unknown
167 ++
168 ++PATH: /home/seb/bin
169 ++PATH: /usr/local/bin
170 ++PATH: /usr/bin
171 ++PATH: /bin
172 ++PATH: /opt/bin
173 ++PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.3.5
174 ++PATH: /opt/intel/Compiler/11.1/072/bin/intel64
175 ++
176 ++
177 ++## ----------- ##
178 ++## Core tests. ##
179 ++## ----------- ##
180 ++
181 ++configure:2883: checking for a BSD-compatible install
182 ++configure:2951: result: /usr/bin/install -c
183 ++configure:2962: checking whether build environment is sane
184 ++configure:3012: result: yes
185 ++configure:3153: checking for a thread-safe mkdir -p
186 ++configure:3192: result: /bin/mkdir -p
187 ++configure:3205: checking for gawk
188 ++configure:3221: found /usr/bin/gawk
189 ++configure:3232: result: gawk
190 ++configure:3243: checking whether make sets $(MAKE)
191 ++configure:3265: result: yes
192 ++configure:3416: checking for g++
193 ++configure:3432: found /usr/bin/g++
194 ++configure:3443: result: g++
195 ++configure:3470: checking for C++ compiler version
196 ++configure:3479: g++ --version >&5
197 ++g++ (Gentoo 4.3.5 p1.0, pie-10.1.5) 4.3.5
198 ++Copyright (C) 2008 Free Software Foundation, Inc.
199 ++This is free software; see the source for copying conditions. There is NO
200 ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
201 ++
202 ++configure:3490: $? = 0
203 ++configure:3479: g++ -v >&5
204 ++Using built-in specs.
205 ++Reading specs from /usr/lib/gcc/x86_64-pc-linux-gnu/4.3.5/asneeded.specs
206 ++Target: x86_64-pc-linux-gnu
207 ++Configured with: /var/tmp/portage/sys-devel/gcc-4.3.5/work/gcc-4.3.5/configure --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/gcc-bin/4.3.5 --includedir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.3.5/include --datadir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.5 --mandir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.5/man --infodir=/usr/share/gcc-data/x86_64-pc-linux-gnu/4.3.5/info --with-gxx-include-dir=/usr/lib/gcc/x86_64-pc-linux-gnu/4.3.5/include/g++-v4 --host=x86_64-pc-linux-gnu --build=x86_64-pc-linux-gnu --disable-altivec --disable-fixed-point --enable-nls --without-included-gettext --with-system-zlib --disable-checking --disable-werror --enable-secureplt --enable-multilib --enable-libmudflap --disable-libssp --enable-libgomp --enable-cld --disable-libgcj --enable-languages=c,c++,treelang,fortran --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu --with-bugurl=http://bugs.gentoo.org/ --with-pkgversion='Gentoo 4.3.5 p1.0, pie-10.1.5'
208 ++Thread model: posix
209 ++gcc version 4.3.5 (Gentoo 4.3.5 p1.0, pie-10.1.5)
210 ++configure:3490: $? = 0
211 ++configure:3479: g++ -V >&5
212 ++g++: '-V' option must have argument
213 ++configure:3490: $? = 1
214 ++configure:3479: g++ -qversion >&5
215 ++g++: unrecognized option '-qversion'
216 ++g++: no input files
217 ++configure:3490: $? = 1
218 ++configure:3510: checking whether the C++ compiler works
219 ++configure:3532: g++ conftest.cpp >&5
220 ++
221 ++## ---------------- ##
222 ++## Cache variables. ##
223 ++## ---------------- ##
224 ++
225 ++ac_cv_env_CCC_set=
226 ++ac_cv_env_CCC_value=
227 ++ac_cv_env_CC_set=
228 ++ac_cv_env_CC_value=
229 ++ac_cv_env_CFLAGS_set=
230 ++ac_cv_env_CFLAGS_value=
231 ++ac_cv_env_CPPFLAGS_set=
232 ++ac_cv_env_CPPFLAGS_value=
233 ++ac_cv_env_CPP_set=
234 ++ac_cv_env_CPP_value=
235 ++ac_cv_env_CXXCPP_set=
236 ++ac_cv_env_CXXCPP_value=
237 ++ac_cv_env_CXXFLAGS_set=
238 ++ac_cv_env_CXXFLAGS_value=
239 ++ac_cv_env_CXX_set=
240 ++ac_cv_env_CXX_value=
241 ++ac_cv_env_LDFLAGS_set=
242 ++ac_cv_env_LDFLAGS_value=
243 ++ac_cv_env_LIBS_set=
244 ++ac_cv_env_LIBS_value=
245 ++ac_cv_env_build_alias_set=
246 ++ac_cv_env_build_alias_value=
247 ++ac_cv_env_host_alias_set=
248 ++ac_cv_env_host_alias_value=
249 ++ac_cv_env_target_alias_set=
250 ++ac_cv_env_target_alias_value=
251 ++ac_cv_path_install='/usr/bin/install -c'
252 ++ac_cv_path_mkdir=/bin/mkdir
253 ++ac_cv_prog_AWK=gawk
254 ++ac_cv_prog_ac_ct_CXX=g++
255 ++ac_cv_prog_make_make_set=yes
256 ++
257 ++## ----------------- ##
258 ++## Output variables. ##
259 ++## ----------------- ##
260 ++
261 ++ACLOCAL='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run aclocal-1.11'
262 ++ADDEXA_FALSE=''
263 ++ADDEXA_TRUE=''
264 ++ADOLC_PATCHLEVEL=''
265 ++ADOLC_SUBVERSION=''
266 ++ADOLC_VERSION=''
267 ++AMDEPBACKSLASH=''
268 ++AMDEP_FALSE=''
269 ++AMDEP_TRUE=''
270 ++AMTAR='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run tar'
271 ++AM_MAKEFLAGS=''
272 ++AR=''
273 ++AS=''
274 ++AUTOCONF='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run autoconf'
275 ++AUTOHEADER='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run autoheader'
276 ++AUTOMAKE='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run automake-1.11'
277 ++AWK='gawk'
278 ++CC=''
279 ++CCDEPMODE=''
280 ++CFLAGS=''
281 ++COLPACK_CFLAGS=''
282 ++COLPACK_LIBS=''
283 ++CPP=''
284 ++CPPFLAGS=''
285 ++CXX='g++'
286 ++CXXCPP=''
287 ++CXXDEPMODE=''
288 ++CXXFLAGS=''
289 ++CYGPATH_W='echo'
290 ++DEFS=''
291 ++DEPDIR=''
292 ++DLLTOOL=''
293 ++DOCEXA_FALSE=''
294 ++DOCEXA_TRUE=''
295 ++DOLT_BASH=''
296 ++DSYMUTIL=''
297 ++DUMPBIN=''
298 ++ECHO_C=''
299 ++ECHO_N='-n'
300 ++ECHO_T=''
301 ++EGREP=''
302 ++EXEEXT=''
303 ++F77=''
304 ++FC=''
305 ++FGREP=''
306 ++GREP=''
307 ++HAVE_LIBCOLPACK_FALSE=''
308 ++HAVE_LIBCOLPACK_TRUE=''
309 ++INSTALL_DATA='${INSTALL} -m 644'
310 ++INSTALL_PROGRAM='${INSTALL}'
311 ++INSTALL_SCRIPT='${INSTALL}'
312 ++INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
313 ++LD=''
314 ++LDFLAGS=''
315 ++LIBOBJS=''
316 ++LIBS=''
317 ++LIBTOOL=''
318 ++LIPO=''
319 ++LN_S=''
320 ++LTCOMPILE=''
321 ++LTCXXCOMPILE=''
322 ++LTLIBOBJS=''
323 ++MAKEFLAGS=''
324 ++MAKEINFO='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run makeinfo'
325 ++MCS=''
326 ++MKDIR_P='/bin/mkdir -p'
327 ++NM=''
328 ++NMEDIT=''
329 ++OBJC=''
330 ++OBJDUMP=''
331 ++OBJEXT=''
332 ++OTOOL64=''
333 ++OTOOL=''
334 ++PACKAGE='adolc'
335 ++PACKAGE_BUGREPORT='adol-c@××××××××××××.org'
336 ++PACKAGE_NAME='adolc'
337 ++PACKAGE_STRING='adolc 2.1.12'
338 ++PACKAGE_TARNAME='adolc'
339 ++PACKAGE_URL=''
340 ++PACKAGE_VERSION='2.1.12'
341 ++PAREXA_FALSE=''
342 ++PAREXA_TRUE=''
343 ++PATH_SEPARATOR=':'
344 ++Q=''
345 ++RANLIB=''
346 ++SED=''
347 ++SET_MAKE=''
348 ++SHELL='/bin/sh'
349 ++SPARSE_FALSE=''
350 ++SPARSE_TRUE=''
351 ++STRIP=''
352 ++V=''
353 ++VERSION='2.1.12'
354 ++_lib=''
355 ++ac_adolc_cflags=''
356 ++ac_adolc_cxxflags=''
357 ++ac_aux_dir='autoconf'
358 ++ac_ct_CC=''
359 ++ac_ct_CXX='g++'
360 ++ac_ct_DUMPBIN=''
361 ++am__EXEEXT_FALSE=''
362 ++am__EXEEXT_TRUE=''
363 ++am__fastdepCC_FALSE=''
364 ++am__fastdepCC_TRUE=''
365 ++am__fastdepCXX_FALSE=''
366 ++am__fastdepCXX_TRUE=''
367 ++am__include=''
368 ++am__isrc=''
369 ++am__leading_dot='.'
370 ++am__quote=''
371 ++am__tar='${AMTAR} chof - "$$tardir"'
372 ++am__untar='${AMTAR} xf -'
373 ++bindir='${exec_prefix}/bin'
374 ++build=''
375 ++build_alias=''
376 ++build_cpu=''
377 ++build_os=''
378 ++build_vendor=''
379 ++datadir='${datarootdir}'
380 ++datarootdir='${prefix}/share'
381 ++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
382 ++dvidir='${docdir}'
383 ++exec_prefix='NONE'
384 ++host=''
385 ++host_alias=''
386 ++host_cpu=''
387 ++host_os=''
388 ++host_vendor=''
389 ++htmldir='${docdir}'
390 ++includedir='${prefix}/include'
391 ++infodir='${datarootdir}/info'
392 ++install_sh='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/install-sh'
393 ++libdir='${exec_prefix}/lib'
394 ++libexecdir='${exec_prefix}/libexec'
395 ++localedir='${datarootdir}/locale'
396 ++localstatedir='${prefix}/var'
397 ++lt_ECHO='echo'
398 ++mandir='${datarootdir}/man'
399 ++mkdir_p='/bin/mkdir -p'
400 ++oldincludedir='/usr/include'
401 ++pdfdir='${docdir}'
402 ++prefix='NONE'
403 ++program_transform_name='s,x,x,'
404 ++psdir='${docdir}'
405 ++sbindir='${exec_prefix}/sbin'
406 ++sharedstatedir='${prefix}/com'
407 ++shavedir=''
408 ++sysconfdir='${prefix}/etc'
409 ++target_alias=''
410 ++
411 ++## ----------- ##
412 ++## confdefs.h. ##
413 ++## ----------- ##
414 ++
415 ++/* confdefs.h */
416 ++#define PACKAGE_NAME "adolc"
417 ++#define PACKAGE_TARNAME "adolc"
418 ++#define PACKAGE_VERSION "2.1.12"
419 ++#define PACKAGE_STRING "adolc 2.1.12"
420 ++#define PACKAGE_BUGREPORT "adol-c@××××××××××××.org"
421 ++#define PACKAGE_URL ""
422 ++#define PACKAGE "adolc"
423 ++#define VERSION "2.1.12"
424 ++
425 ++configure: caught signal 2
426 ++configure: exit 1
427 +diff -Nur ADOL-C-2.1.12.orig/configure.ac ADOL-C-2.1.12/configure.ac
428 +--- ADOL-C-2.1.12.orig/configure.ac 2011-03-28 00:28:00.000000000 +0100
429 ++++ ADOL-C-2.1.12/configure.ac 2011-03-30 05:05:10.000000000 +0100
430 +@@ -50,7 +50,7 @@
431 + else
432 + _lib=lib
433 + fi
434 +-libdir='${prefix}/${_lib}'
435 ++libdir="${prefix}/${_lib}"
436 + AC_SUBST(_lib)
437 + AC_SUBST(libdir)
438 +
439 +@@ -160,17 +160,18 @@
440 + [colpack=${abs_srcdir}/ThirdParty/ColPack])
441 +
442 + if test "x${_lib}" != xlib ; then
443 +- dirlist="${_lib} lib build/${_lib} build/lib"
444 ++ dirlist="${libdir} ${_lib} lib build/${_lib} build/lib"
445 + else
446 +- dirlist="${_lib} build/${_lib}"
447 ++ dirlist="${libdir} ${_lib} build/${_lib}"
448 + fi
449 +
450 ++if test x$colpack != xno; then
451 + AC_LANG_PUSH([C++])
452 + for dir in $dirlist ; do
453 + unset ac_cv_header_ColPackHeaders_h
454 +- COLPACK_CFLAGS="-I$colpack/$dir/../include"
455 +- COLPACK_LIBDIR="$colpack/$dir"
456 +- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
457 ++ COLPACK_CFLAGS="-I$dir/../include/ColPack"
458 ++ COLPACK_LIBDIR="$dir"
459 ++ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack"
460 + save_CPPFLAGS="$CPPFLAGS"
461 + save_LIBS="$LIBS"
462 + CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS"
463 +@@ -194,6 +195,10 @@
464 + fi
465 + done
466 + AC_LANG_POP([C++])
467 ++else
468 ++ have_colpack=no
469 ++fi
470 ++
471 + AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
472 + if test x$have_colpack = xyes; then
473 + # test if the directories exists and what is the real path
474 +@@ -201,13 +206,13 @@
475 + # and these variables are useless
476 + COLPACK_LIBDIR=`readlink -f $COLPACK_LIBDIR`
477 + if test -n $COLPACK_LIBDIR ; then
478 +- colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include`
479 ++ colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include/ColPack`
480 + if test -n $colpack_incdir ; then
481 + COLPACK_CFLAGS="-I$colpack_incdir"
482 + else
483 + COLPACK_CFLAGS=""
484 + fi
485 +- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
486 ++ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack"
487 + else
488 + COLPACK_CFLAGS=""
489 + COLPACK_LIBS=""
490 +@@ -272,7 +277,7 @@
491 + AC_MSG_CHECKING(whether to build parallel example)
492 + AC_ARG_ENABLE(parexa,
493 + [AS_HELP_STRING([--enable-parexa],
494 +- [build parallel example [default=disabled], if enabled -with-openmp-flag=FLAG required])],
495 ++ [build parallel example [default=disabled], if enabled, --enable-openmp required])],
496 + [parexa=$enableval
497 + AC_MSG_RESULT(yes)],
498 + [parexa="no"
499 +@@ -280,16 +285,7 @@
500 + AM_CONDITIONAL(PAREXA,[test x${parexa} = xyes])
501 +
502 + # ADOL-C Compilation flags
503 +-AC_MSG_CHECKING(which flag to use to enable OpenMP)
504 +-AC_ARG_WITH(openmp-flag,
505 +- [AS_HELP_STRING([--with-openmp-flag=FLAG],
506 +- [use FLAG to enable OpenMP at compile time [default=none]])],
507 +- [ac_adolc_openmpflag=$withval
508 +- msg_result=$withval
509 +- AC_MSG_RESULT($ac_adolc_openmpflag)],
510 +- [ac_adolc_openmpflag=""
511 +- msg_result="none"
512 +- AC_MSG_RESULT($ac_adolc_openmpflag)])
513 ++AC_OPENMP
514 +
515 + AC_MSG_CHECKING(which CFLAGS to use)
516 + AC_ARG_WITH(cflags,
517 +@@ -300,7 +296,7 @@
518 + test x${adolc_harddebug} == xyes ; then
519 + ac_adolc_cflags="$ac_adolc_cflags -g -O0"
520 + fi
521 +- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
522 ++ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS"
523 + AC_SUBST(ac_adolc_cflags)
524 + AC_MSG_RESULT($ac_adolc_cflags)],
525 + [if test "$ac_shell_cflags" = "not_set"; then
526 +@@ -312,7 +308,7 @@
527 + else
528 + ac_adolc_cflags="$CFLAGS"
529 + fi
530 +- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
531 ++ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS"
532 +
533 + AC_SUBST(ac_adolc_cflags)
534 + AC_MSG_RESULT($ac_adolc_cflags)])
535 +@@ -326,7 +322,7 @@
536 + test x${adolc_harddebug} == xyes ; then
537 + ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0"
538 + fi
539 +- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
540 ++ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS"
541 + AC_SUBST(ac_adolc_cxxflags)
542 + AC_MSG_RESULT($ac_adolc_cxxflags)],
543 + [if test "$ac_shell_cxxflags" = "not_set"; then
544 +@@ -338,7 +334,7 @@
545 + else
546 + ac_adolc_cxxflags="$CXXFLAGS"
547 + fi
548 +- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
549 ++ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS"
550 + AC_SUBST(ac_adolc_cxxflags)
551 + AC_MSG_RESULT($ac_adolc_cxxflags)])
552 +
553 +@@ -453,7 +449,7 @@
554 + Use ADOL-C hard debug mode: ${adolc_harddebug}
555 + Use ADOL-C adouble zeroing mode: ${adolc_stdczero}"
556 +
557 +-if [[ "x${ac_adolc_openmpflag}" != "x" ]] ; then
558 ++if [[ "x${OPENMP_CFLAGS}" != "x" ]] ; then
559 + echo \
560 + " Access thread number via errno: ${adolc_tserrno}"
561 + fi
562
563 diff --git a/sci-libs/adolc/files/adolc-2.1.12-sparse-openmp.patch b/sci-libs/adolc/files/adolc-2.1.12-sparse-openmp.patch
564 new file mode 100644
565 index 0000000..241517c
566 --- /dev/null
567 +++ b/sci-libs/adolc/files/adolc-2.1.12-sparse-openmp.patch
568 @@ -0,0 +1,20 @@
569 +--- ADOL-C-2.1.12.orig/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-28 00:28:00.000000000 +0100
570 ++++ ADOL-C-2.1.12/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-30 04:05:29.000000000 +0100
571 +@@ -598,6 +598,8 @@
572 + {
573 + SparseHessInfos sHinfos;
574 + TapeInfos *tapeInfos;
575 ++ ADOLC_OPENMP_THREAD_NUMBER;
576 ++ ADOLC_OPENMP_GET_THREAD_NUMBER;
577 +
578 + tapeInfos=getTapeInfos(tag);
579 + memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos));
580 +@@ -626,6 +628,8 @@
581 + {
582 + SparseHessInfos sHinfos;
583 + TapeInfos *tapeInfos;
584 ++ ADOLC_OPENMP_THREAD_NUMBER;
585 ++ ADOLC_OPENMP_GET_THREAD_NUMBER;
586 +
587 + tapeInfos=getTapeInfos(tag);
588 + memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos));
589
590 diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
591 new file mode 100644
592 index 0000000..e5dda79
593 --- /dev/null
594 +++ b/sci-libs/adolc/metadata.xml
595 @@ -0,0 +1,11 @@
596 +<?xml version="1.0" encoding="UTF-8"?>
597 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
598 +<pkgmetadata>
599 +<herd>sci</herd>
600 +<longdescription lang="en">
601 + The ADOLC system automatically calculates exact derivatives of a
602 + C/C++ function. It uses C++ overloading to record arithmetic
603 + operations, which it plays back later in various ways to calculate
604 + the requested values.
605 +</longdescription>
606 +</pkgmetadata>
Report Message
Find on MARC Find on Google Groups