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: Tue, 03 Jul 2012 16:23:37
Message-Id: 1341331982.f35a78008b8578a5bc41e03e3b3014fe13965b45.bicatali@gentoo
1 commit: f35a78008b8578a5bc41e03e3b3014fe13965b45
2 Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
3 AuthorDate: Tue Jul 3 16:13:02 2012 +0000
4 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 3 16:13:02 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=f35a7800
7
8 now in sci overlay
9
10 ---
11 sci-libs/adolc/ChangeLog | 11 --
12 sci-libs/adolc/Manifest | 6 -
13 sci-libs/adolc/adolc-2.2.1.ebuild | 39 ------
14 sci-libs/adolc/files/2.2.1-autotools.patch | 168 ------------------------
15 sci-libs/adolc/files/2.2.1-sparse-openmp.patch | 20 ---
16 sci-libs/adolc/metadata.xml | 11 --
17 6 files changed, 0 insertions(+), 255 deletions(-)
18
19 diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
20 deleted file mode 100644
21 index f24a320..0000000
22 --- a/sci-libs/adolc/ChangeLog
23 +++ /dev/null
24 @@ -1,11 +0,0 @@
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 deleted file mode 100644
39 index 9c06b2c..0000000
40 --- a/sci-libs/adolc/Manifest
41 +++ /dev/null
42 @@ -1,6 +0,0 @@
43 -AUX 2.2.1-autotools.patch 6262 RMD160 3c1f26219138c30f836cf003b12d1b15852891f8 SHA1 2cb9309c6fff3a43424492ca0c173efc7b4f8ba0 SHA256 e14ac202ce87930637294b60fe04d79ee0de4e72d2dc0ad67d3413a36d60b9c2
44 -AUX 2.2.1-sparse-openmp.patch 697 RMD160 198842380b04cb602e16d0b98cf2869de66c51c2 SHA1 910fc4f27287d2236394d0b62238e4becf0518b3 SHA256 522a34c9ac434240e55e97fca7ae7b1ae3474e06131c42bdb918965944bb86b8
45 -DIST ADOL-C-2.2.1.tgz 2125619 RMD160 b571f43fea8f5bcfb6ff31dbb420a23af153c4df SHA1 d81b613ba9a7de43edf0fa2cb756b1088655c440 SHA256 603f9363f5e4b556c869c980f81485b1d522cfda1d7b0cebf5431f8eca487ea1
46 -EBUILD adolc-2.2.1.ebuild 810 RMD160 8e1944d9e97feddcc49be782d257272f61e4df40 SHA1 f3599b0e214f4a231a047939bd7e09063dc9e874 SHA256 b046e2300ac0eda3cc30100508596fc035f184f9e01d2567754c47b0914f10fd
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.2.1.ebuild b/sci-libs/adolc/adolc-2.2.1.ebuild
51 deleted file mode 100644
52 index 59e480c..0000000
53 --- a/sci-libs/adolc/adolc-2.2.1.ebuild
54 +++ /dev/null
55 @@ -1,39 +0,0 @@
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}"/${PV}-autotools.patch
81 - epatch "${FILESDIR}"/${PV}-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/2.2.1-autotools.patch b/sci-libs/adolc/files/2.2.1-autotools.patch
97 deleted file mode 100644
98 index 541da2a..0000000
99 --- a/sci-libs/adolc/files/2.2.1-autotools.patch
100 +++ /dev/null
101 @@ -1,168 +0,0 @@
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/configure.ac ADOL-C-2.1.12/configure.ac
136 ---- ADOL-C-2.1.12.orig/configure.ac 2011-03-28 00:28:00.000000000 +0100
137 -+++ ADOL-C-2.1.12/configure.ac 2011-03-30 05:05:10.000000000 +0100
138 -@@ -50,7 +50,7 @@
139 - else
140 - _lib=lib
141 - fi
142 --libdir='${prefix}/${_lib}'
143 -+libdir="${prefix}/${_lib}"
144 - AC_SUBST(_lib)
145 - AC_SUBST(libdir)
146 -
147 -@@ -160,17 +160,18 @@
148 - [colpack=${abs_srcdir}/ThirdParty/ColPack])
149 -
150 - if test "x${_lib}" != xlib ; then
151 -- dirlist="${_lib} lib build/${_lib} build/lib"
152 -+ dirlist="${libdir} ${_lib} lib build/${_lib} build/lib"
153 - else
154 -- dirlist="${_lib} build/${_lib}"
155 -+ dirlist="${libdir} ${_lib} build/${_lib}"
156 - fi
157 -
158 -+if test x$colpack != xno; then
159 - AC_LANG_PUSH([C++])
160 - for dir in $dirlist ; do
161 - unset ac_cv_header_ColPackHeaders_h
162 -- COLPACK_CFLAGS="-I$colpack/$dir/../include"
163 -- COLPACK_LIBDIR="$colpack/$dir"
164 -- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
165 -+ COLPACK_CFLAGS="-I$dir/../include/ColPack"
166 -+ COLPACK_LIBDIR="$dir"
167 -+ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack"
168 - save_CPPFLAGS="$CPPFLAGS"
169 - save_LIBS="$LIBS"
170 - CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS"
171 -@@ -194,6 +195,10 @@
172 - fi
173 - done
174 - AC_LANG_POP([C++])
175 -+else
176 -+ have_colpack=no
177 -+fi
178 -+
179 - AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes])
180 - if test x$have_colpack = xyes; then
181 - # test if the directories exists and what is the real path
182 -@@ -201,13 +206,13 @@
183 - # and these variables are useless
184 - COLPACK_LIBDIR=`readlink -f $COLPACK_LIBDIR`
185 - if test -n $COLPACK_LIBDIR ; then
186 -- colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include`
187 -+ colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include/ColPack`
188 - if test -n $colpack_incdir ; then
189 - COLPACK_CFLAGS="-I$colpack_incdir"
190 - else
191 - COLPACK_CFLAGS=""
192 - fi
193 -- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR"
194 -+ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack"
195 - else
196 - COLPACK_CFLAGS=""
197 - COLPACK_LIBS=""
198 -@@ -272,7 +277,7 @@
199 - AC_MSG_CHECKING(whether to build parallel example)
200 - AC_ARG_ENABLE(parexa,
201 - [AS_HELP_STRING([--enable-parexa],
202 -- [build parallel example [default=disabled], if enabled -with-openmp-flag=FLAG required])],
203 -+ [build parallel example [default=disabled], if enabled, --enable-openmp required])],
204 - [parexa=$enableval
205 - AC_MSG_RESULT(yes)],
206 - [parexa="no"
207 -@@ -280,16 +285,7 @@
208 - AM_CONDITIONAL(PAREXA,[test x${parexa} = xyes])
209 -
210 - # ADOL-C Compilation flags
211 --AC_MSG_CHECKING(which flag to use to enable OpenMP)
212 --AC_ARG_WITH(openmp-flag,
213 -- [AS_HELP_STRING([--with-openmp-flag=FLAG],
214 -- [use FLAG to enable OpenMP at compile time [default=none]])],
215 -- [ac_adolc_openmpflag=$withval
216 -- msg_result=$withval
217 -- AC_MSG_RESULT($ac_adolc_openmpflag)],
218 -- [ac_adolc_openmpflag=""
219 -- msg_result="none"
220 -- AC_MSG_RESULT($ac_adolc_openmpflag)])
221 -+AC_OPENMP
222 -
223 - AC_MSG_CHECKING(which CFLAGS to use)
224 - AC_ARG_WITH(cflags,
225 -@@ -300,7 +296,7 @@
226 - test x${adolc_harddebug} == xyes ; then
227 - ac_adolc_cflags="$ac_adolc_cflags -g -O0"
228 - fi
229 -- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
230 -+ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS"
231 - AC_SUBST(ac_adolc_cflags)
232 - AC_MSG_RESULT($ac_adolc_cflags)],
233 - [if test "$ac_shell_cflags" = "not_set"; then
234 -@@ -312,7 +308,7 @@
235 - else
236 - ac_adolc_cflags="$CFLAGS"
237 - fi
238 -- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag"
239 -+ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS"
240 -
241 - AC_SUBST(ac_adolc_cflags)
242 - AC_MSG_RESULT($ac_adolc_cflags)])
243 -@@ -326,7 +322,7 @@
244 - test x${adolc_harddebug} == xyes ; then
245 - ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0"
246 - fi
247 -- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
248 -+ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS"
249 - AC_SUBST(ac_adolc_cxxflags)
250 - AC_MSG_RESULT($ac_adolc_cxxflags)],
251 - [if test "$ac_shell_cxxflags" = "not_set"; then
252 -@@ -338,7 +334,7 @@
253 - else
254 - ac_adolc_cxxflags="$CXXFLAGS"
255 - fi
256 -- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag"
257 -+ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS"
258 - AC_SUBST(ac_adolc_cxxflags)
259 - AC_MSG_RESULT($ac_adolc_cxxflags)])
260 -
261 -@@ -453,7 +449,7 @@
262 - Use ADOL-C hard debug mode: ${adolc_harddebug}
263 - Use ADOL-C adouble zeroing mode: ${adolc_stdczero}"
264 -
265 --if [[ "x${ac_adolc_openmpflag}" != "x" ]] ; then
266 -+if [[ "x${OPENMP_CFLAGS}" != "x" ]] ; then
267 - echo \
268 - " Access thread number via errno: ${adolc_tserrno}"
269 - fi
270
271 diff --git a/sci-libs/adolc/files/2.2.1-sparse-openmp.patch b/sci-libs/adolc/files/2.2.1-sparse-openmp.patch
272 deleted file mode 100644
273 index 241517c..0000000
274 --- a/sci-libs/adolc/files/2.2.1-sparse-openmp.patch
275 +++ /dev/null
276 @@ -1,20 +0,0 @@
277 ---- ADOL-C-2.1.12.orig/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-28 00:28:00.000000000 +0100
278 -+++ ADOL-C-2.1.12/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-30 04:05:29.000000000 +0100
279 -@@ -598,6 +598,8 @@
280 - {
281 - SparseHessInfos sHinfos;
282 - TapeInfos *tapeInfos;
283 -+ ADOLC_OPENMP_THREAD_NUMBER;
284 -+ ADOLC_OPENMP_GET_THREAD_NUMBER;
285 -
286 - tapeInfos=getTapeInfos(tag);
287 - memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos));
288 -@@ -626,6 +628,8 @@
289 - {
290 - SparseHessInfos sHinfos;
291 - TapeInfos *tapeInfos;
292 -+ ADOLC_OPENMP_THREAD_NUMBER;
293 -+ ADOLC_OPENMP_GET_THREAD_NUMBER;
294 -
295 - tapeInfos=getTapeInfos(tag);
296 - memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos));
297
298 diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml
299 deleted file mode 100644
300 index e5dda79..0000000
301 --- a/sci-libs/adolc/metadata.xml
302 +++ /dev/null
303 @@ -1,11 +0,0 @@
304 -<?xml version="1.0" encoding="UTF-8"?>
305 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
306 -<pkgmetadata>
307 -<herd>sci</herd>
308 -<longdescription lang="en">
309 - The ADOLC system automatically calculates exact derivatives of a
310 - C/C++ function. It uses C++ overloading to record arithmetic
311 - operations, which it plays back later in various ways to calculate
312 - the requested values.
313 -</longdescription>
314 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups