From f35a78008b8578a5bc41e03e3b3014fe13965b45 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 3 Jul 2012 09:13:02 -0700 Subject: now in sci overlay --- sci-libs/adolc/ChangeLog | 11 -- sci-libs/adolc/Manifest | 6 - sci-libs/adolc/adolc-2.2.1.ebuild | 39 ------ sci-libs/adolc/files/2.2.1-autotools.patch | 168 ------------------------- sci-libs/adolc/files/2.2.1-sparse-openmp.patch | 20 --- sci-libs/adolc/metadata.xml | 11 -- 6 files changed, 255 deletions(-) delete mode 100644 sci-libs/adolc/ChangeLog delete mode 100644 sci-libs/adolc/Manifest delete mode 100644 sci-libs/adolc/adolc-2.2.1.ebuild delete mode 100644 sci-libs/adolc/files/2.2.1-autotools.patch delete mode 100644 sci-libs/adolc/files/2.2.1-sparse-openmp.patch delete mode 100644 sci-libs/adolc/metadata.xml diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog deleted file mode 100644 index f24a320..0000000 --- a/sci-libs/adolc/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -# ChangeLog for sci-libs/adolc -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*adolc-2.1.12 (30 Mar 2011) - - 30 Mar 2011; Sébastien Fabbro +adolc-2.1.12.ebuild, - +files/adolc-2.1.12-autotools.patch, +files/adolc-2.1.12-sparse-openmp.patch, - +metadata.xml: - Initial import - diff --git a/sci-libs/adolc/Manifest b/sci-libs/adolc/Manifest deleted file mode 100644 index 9c06b2c..0000000 --- a/sci-libs/adolc/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 2.2.1-autotools.patch 6262 RMD160 3c1f26219138c30f836cf003b12d1b15852891f8 SHA1 2cb9309c6fff3a43424492ca0c173efc7b4f8ba0 SHA256 e14ac202ce87930637294b60fe04d79ee0de4e72d2dc0ad67d3413a36d60b9c2 -AUX 2.2.1-sparse-openmp.patch 697 RMD160 198842380b04cb602e16d0b98cf2869de66c51c2 SHA1 910fc4f27287d2236394d0b62238e4becf0518b3 SHA256 522a34c9ac434240e55e97fca7ae7b1ae3474e06131c42bdb918965944bb86b8 -DIST ADOL-C-2.2.1.tgz 2125619 RMD160 b571f43fea8f5bcfb6ff31dbb420a23af153c4df SHA1 d81b613ba9a7de43edf0fa2cb756b1088655c440 SHA256 603f9363f5e4b556c869c980f81485b1d522cfda1d7b0cebf5431f8eca487ea1 -EBUILD adolc-2.2.1.ebuild 810 RMD160 8e1944d9e97feddcc49be782d257272f61e4df40 SHA1 f3599b0e214f4a231a047939bd7e09063dc9e874 SHA256 b046e2300ac0eda3cc30100508596fc035f184f9e01d2567754c47b0914f10fd -MISC ChangeLog 336 RMD160 8d32da58c16fcf436a4f89ae26355711f21ecf86 SHA1 5d23cef61d21d846c0b90ffba82bcffddf35a801 SHA256 380d9e7e87577e19c6997fe0374de50c312ab89adb5b4feef0cc55e37a5c2a84 -MISC metadata.xml 427 RMD160 95c85f303e6883ba7546e9b659db29f14360f195 SHA1 f664d5f8f3141e597384a2712a6dc702d55c7654 SHA256 dbccbfff23b0d47223a5098ee2aae71b87ce0373de80183767f39db667722396 diff --git a/sci-libs/adolc/adolc-2.2.1.ebuild b/sci-libs/adolc/adolc-2.2.1.ebuild deleted file mode 100644 index 59e480c..0000000 --- a/sci-libs/adolc/adolc-2.2.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 -inherit eutils autotools - -MYPN=ADOL-C - -DESCRIPTION="Automatic differentiation system for C/C++" -HOMEPAGE="https://projects.coin-or.org/ADOL-C/" -SRC_URI="http://www.coin-or.org/download/source/${MYPN}/${MYPN}-${PV}.tgz" - -LICENSE="|| ( CPL GPL-2 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples openmp sparse static-libs" - -RDEPEND="sparse? ( sci-libs/colpack )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MYPN}-${PV} - -src_prepare() { - epatch "${FILESDIR}"/${PV}-autotools.patch - epatch "${FILESDIR}"/${PV}-sparse-openmp.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable openmp) \ - $(use_enable static-libs static) \ - $(use_with sparse colpack) -} - -src_test() { - emake test -} diff --git a/sci-libs/adolc/files/2.2.1-autotools.patch b/sci-libs/adolc/files/2.2.1-autotools.patch deleted file mode 100644 index 541da2a..0000000 --- a/sci-libs/adolc/files/2.2.1-autotools.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -Nur ADOL-C-2.1.12.orig/ADOL-C/src/Makefile.am ADOL-C-2.1.12/ADOL-C/src/Makefile.am ---- ADOL-C-2.1.12.orig/ADOL-C/src/Makefile.am 2011-03-28 00:28:00.000000000 +0100 -+++ ADOL-C-2.1.12/ADOL-C/src/Makefile.am 2011-03-30 05:49:17.000000000 +0100 -@@ -19,7 +19,6 @@ - endif - - AM_CPPFLAGS = -I$(top_srcdir)/ADOL-C -- - INCLUDES = -I$(top_builddir)/ADOL-C - - if SPARSE -@@ -63,8 +62,7 @@ - int_reverse_s.c int_reverse_t.c - - libadolc_la_LIBADD = drivers/libdrivers.la sparse/libsparse.la \ -- tapedoc/libtapedoc.la --libadolc_la_LDFLAGS += @COLPACK_LIBS@ -+ tapedoc/libtapedoc.la @COLPACK_LIBS@ - else - libadolc_la_SOURCES = adalloc.c malloc.c adouble.cpp \ - convolut.c fortutils.c\ -diff -Nur ADOL-C-2.1.12.orig/ADOL-C/test/Makefile.am ADOL-C-2.1.12/ADOL-C/test/Makefile.am ---- ADOL-C-2.1.12.orig/ADOL-C/test/Makefile.am 2011-03-28 00:28:00.000000000 +0100 -+++ ADOL-C-2.1.12/ADOL-C/test/Makefile.am 2011-03-30 04:45:33.000000000 +0100 -@@ -10,7 +10,7 @@ - ## - ############################################################################## - --noinst_PROGRAMS = powexam speelpenning fminmax -+check_PROGRAMS = powexam speelpenning fminmax - - speelpenning_SOURCES = speelpenning.cpp - -diff -Nur ADOL-C-2.1.12.orig/configure.ac ADOL-C-2.1.12/configure.ac ---- ADOL-C-2.1.12.orig/configure.ac 2011-03-28 00:28:00.000000000 +0100 -+++ ADOL-C-2.1.12/configure.ac 2011-03-30 05:05:10.000000000 +0100 -@@ -50,7 +50,7 @@ - else - _lib=lib - fi --libdir='${prefix}/${_lib}' -+libdir="${prefix}/${_lib}" - AC_SUBST(_lib) - AC_SUBST(libdir) - -@@ -160,17 +160,18 @@ - [colpack=${abs_srcdir}/ThirdParty/ColPack]) - - if test "x${_lib}" != xlib ; then -- dirlist="${_lib} lib build/${_lib} build/lib" -+ dirlist="${libdir} ${_lib} lib build/${_lib} build/lib" - else -- dirlist="${_lib} build/${_lib}" -+ dirlist="${libdir} ${_lib} build/${_lib}" - fi - -+if test x$colpack != xno; then - AC_LANG_PUSH([C++]) - for dir in $dirlist ; do - unset ac_cv_header_ColPackHeaders_h -- COLPACK_CFLAGS="-I$colpack/$dir/../include" -- COLPACK_LIBDIR="$colpack/$dir" -- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR" -+ COLPACK_CFLAGS="-I$dir/../include/ColPack" -+ COLPACK_LIBDIR="$dir" -+ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack" - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $COLPACK_CFLAGS" -@@ -194,6 +195,10 @@ - fi - done - AC_LANG_POP([C++]) -+else -+ have_colpack=no -+fi -+ - AM_CONDITIONAL(HAVE_LIBCOLPACK,[test x$have_colpack = xyes]) - if test x$have_colpack = xyes; then - # test if the directories exists and what is the real path -@@ -201,13 +206,13 @@ - # and these variables are useless - COLPACK_LIBDIR=`readlink -f $COLPACK_LIBDIR` - if test -n $COLPACK_LIBDIR ; then -- colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include` -+ colpack_incdir=`readlink -f $COLPACK_LIBDIR/../include/ColPack` - if test -n $colpack_incdir ; then - COLPACK_CFLAGS="-I$colpack_incdir" - else - COLPACK_CFLAGS="" - fi -- COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR" -+ COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack" - else - COLPACK_CFLAGS="" - COLPACK_LIBS="" -@@ -272,7 +277,7 @@ - AC_MSG_CHECKING(whether to build parallel example) - AC_ARG_ENABLE(parexa, - [AS_HELP_STRING([--enable-parexa], -- [build parallel example [default=disabled], if enabled -with-openmp-flag=FLAG required])], -+ [build parallel example [default=disabled], if enabled, --enable-openmp required])], - [parexa=$enableval - AC_MSG_RESULT(yes)], - [parexa="no" -@@ -280,16 +285,7 @@ - AM_CONDITIONAL(PAREXA,[test x${parexa} = xyes]) - - # ADOL-C Compilation flags --AC_MSG_CHECKING(which flag to use to enable OpenMP) --AC_ARG_WITH(openmp-flag, -- [AS_HELP_STRING([--with-openmp-flag=FLAG], -- [use FLAG to enable OpenMP at compile time [default=none]])], -- [ac_adolc_openmpflag=$withval -- msg_result=$withval -- AC_MSG_RESULT($ac_adolc_openmpflag)], -- [ac_adolc_openmpflag="" -- msg_result="none" -- AC_MSG_RESULT($ac_adolc_openmpflag)]) -+AC_OPENMP - - AC_MSG_CHECKING(which CFLAGS to use) - AC_ARG_WITH(cflags, -@@ -300,7 +296,7 @@ - test x${adolc_harddebug} == xyes ; then - ac_adolc_cflags="$ac_adolc_cflags -g -O0" - fi -- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag" -+ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS" - AC_SUBST(ac_adolc_cflags) - AC_MSG_RESULT($ac_adolc_cflags)], - [if test "$ac_shell_cflags" = "not_set"; then -@@ -312,7 +308,7 @@ - else - ac_adolc_cflags="$CFLAGS" - fi -- ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag" -+ ac_adolc_cflags="$ac_adolc_cflags $OPENMP_CFLAGS" - - AC_SUBST(ac_adolc_cflags) - AC_MSG_RESULT($ac_adolc_cflags)]) -@@ -326,7 +322,7 @@ - test x${adolc_harddebug} == xyes ; then - ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0" - fi -- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag" -+ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS" - AC_SUBST(ac_adolc_cxxflags) - AC_MSG_RESULT($ac_adolc_cxxflags)], - [if test "$ac_shell_cxxflags" = "not_set"; then -@@ -338,7 +334,7 @@ - else - ac_adolc_cxxflags="$CXXFLAGS" - fi -- ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag" -+ ac_adolc_cxxflags="$ac_adolc_cxxflags $OPENMP_CFLAGS" - AC_SUBST(ac_adolc_cxxflags) - AC_MSG_RESULT($ac_adolc_cxxflags)]) - -@@ -453,7 +449,7 @@ - Use ADOL-C hard debug mode: ${adolc_harddebug} - Use ADOL-C adouble zeroing mode: ${adolc_stdczero}" - --if [[ "x${ac_adolc_openmpflag}" != "x" ]] ; then -+if [[ "x${OPENMP_CFLAGS}" != "x" ]] ; then - echo \ - " Access thread number via errno: ${adolc_tserrno}" - fi diff --git a/sci-libs/adolc/files/2.2.1-sparse-openmp.patch b/sci-libs/adolc/files/2.2.1-sparse-openmp.patch deleted file mode 100644 index 241517c..0000000 --- a/sci-libs/adolc/files/2.2.1-sparse-openmp.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ADOL-C-2.1.12.orig/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-28 00:28:00.000000000 +0100 -+++ ADOL-C-2.1.12/ADOL-C/src/sparse/sparsedrivers.cpp 2011-03-30 04:05:29.000000000 +0100 -@@ -598,6 +598,8 @@ - { - SparseHessInfos sHinfos; - TapeInfos *tapeInfos; -+ ADOLC_OPENMP_THREAD_NUMBER; -+ ADOLC_OPENMP_GET_THREAD_NUMBER; - - tapeInfos=getTapeInfos(tag); - memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos)); -@@ -626,6 +628,8 @@ - { - SparseHessInfos sHinfos; - TapeInfos *tapeInfos; -+ ADOLC_OPENMP_THREAD_NUMBER; -+ ADOLC_OPENMP_GET_THREAD_NUMBER; - - tapeInfos=getTapeInfos(tag); - memcpy(&ADOLC_CURRENT_TAPE_INFOS, tapeInfos, sizeof(TapeInfos)); diff --git a/sci-libs/adolc/metadata.xml b/sci-libs/adolc/metadata.xml deleted file mode 100644 index e5dda79..0000000 --- a/sci-libs/adolc/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - -sci - - The ADOLC system automatically calculates exact derivatives of a - C/C++ function. It uses C++ overloading to record arithmetic - operations, which it plays back later in various ways to calculate - the requested values. - - -- cgit v1.2.3-65-gdbad