* [gentoo-commits] dev/bicatali:master commit in: sci-libs/adolc/files/, sci-libs/adolc/
@ 2011-03-31 18:11 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2011-03-31 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 3d9d99e96d42ae64db4b2384b71503599867c762
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 04:53:29 2011 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 04:53:29 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=3d9d99e9
added adolc
---
sci-libs/adolc/ChangeLog | 11 +
sci-libs/adolc/Manifest | 6 +
sci-libs/adolc/adolc-2.1.12.ebuild | 39 ++
sci-libs/adolc/files/adolc-2.1.12-autotools.patch | 460 ++++++++++++++++++++
.../adolc/files/adolc-2.1.12-sparse-openmp.patch | 20 +
sci-libs/adolc/metadata.xml | 11 +
6 files changed, 547 insertions(+), 0 deletions(-)
diff --git a/sci-libs/adolc/ChangeLog b/sci-libs/adolc/ChangeLog
new file mode 100644
index 0000000..f24a320
--- /dev/null
+++ b/sci-libs/adolc/ChangeLog
@@ -0,0 +1,11 @@
+# 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 <bicatali@gentoo.org> +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
new file mode 100644
index 0000000..5bc0585
--- /dev/null
+++ b/sci-libs/adolc/Manifest
@@ -0,0 +1,6 @@
+AUX adolc-2.1.12-autotools.patch 14607 RMD160 756283a1d5e33a1b3c38cde50bf476f99ef7f91f SHA1 a07030bd8d221b8173a50125730d79cbc4ef3a9f SHA256 b174a428121d52c2fa8bfe7663585b6c3606d0e428da876db966b16a6f15cdbf
+AUX adolc-2.1.12-sparse-openmp.patch 697 RMD160 198842380b04cb602e16d0b98cf2869de66c51c2 SHA1 910fc4f27287d2236394d0b62238e4becf0518b3 SHA256 522a34c9ac434240e55e97fca7ae7b1ae3474e06131c42bdb918965944bb86b8
+DIST ADOL-C-2.1.12.tgz 12875303 RMD160 ef0fcaca67d12d137215a42eca8e3afde8bedd41 SHA1 4f760a5b281e7c1a1763351b89ea1351955f9de5 SHA256 38978f8c97a640d15f649cc81da68530863b5f1ac1932dca6035d781503b21f1
+EBUILD adolc-2.1.12.ebuild 808 RMD160 5ed768a3bdc219d325f9be3034134e6c848716be SHA1 bff46bbcbf0201e298d854e5459697705cb5cd96 SHA256 97a86a6e597f840cd86c88b018c7aaa85d47e2be7d164e6d4493a782f1b3deb7
+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.1.12.ebuild b/sci-libs/adolc/adolc-2.1.12.ebuild
new file mode 100644
index 0000000..f2fde06
--- /dev/null
+++ b/sci-libs/adolc/adolc-2.1.12.ebuild
@@ -0,0 +1,39 @@
+# 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}"/${P}-autotools.patch
+ epatch "${FILESDIR}"/${P}-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/adolc-2.1.12-autotools.patch b/sci-libs/adolc/files/adolc-2.1.12-autotools.patch
new file mode 100644
index 0000000..b23b64c
--- /dev/null
+++ b/sci-libs/adolc/files/adolc-2.1.12-autotools.patch
@@ -0,0 +1,460 @@
+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/config.log ADOL-C-2.1.12/config.log
+--- ADOL-C-2.1.12.orig/config.log 1970-01-01 01:00:00.000000000 +0100
++++ ADOL-C-2.1.12/config.log 2011-03-30 05:39:48.000000000 +0100
+@@ -0,0 +1,288 @@
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by adolc configure 2.1.12, which was
++generated by GNU Autoconf 2.65. Invocation command line was
++
++ $ ./configure
++
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = cayenne.ist.utl.pt
++uname -m = x86_64
++uname -r = 2.6.29-gentoo-r6
++uname -s = Linux
++uname -v = #1 SMP PREEMPT Thu May 27 17:13:20 WEST 2010
++
++/usr/bin/uname -p = Quad-Core AMD Opteron(tm) Processor 8354
++/bin/uname -X = unknown
++
++/bin/arch = unknown
++/usr/bin/arch -k = unknown
++/usr/convex/getsysinfo = unknown
++/usr/bin/hostinfo = unknown
++/bin/machine = unknown
++/usr/bin/oslevel = unknown
++/bin/universe = unknown
++
++PATH: /home/seb/bin
++PATH: /usr/local/bin
++PATH: /usr/bin
++PATH: /bin
++PATH: /opt/bin
++PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.3.5
++PATH: /opt/intel/Compiler/11.1/072/bin/intel64
++
++
++## ----------- ##
++## Core tests. ##
++## ----------- ##
++
++configure:2883: checking for a BSD-compatible install
++configure:2951: result: /usr/bin/install -c
++configure:2962: checking whether build environment is sane
++configure:3012: result: yes
++configure:3153: checking for a thread-safe mkdir -p
++configure:3192: result: /bin/mkdir -p
++configure:3205: checking for gawk
++configure:3221: found /usr/bin/gawk
++configure:3232: result: gawk
++configure:3243: checking whether make sets $(MAKE)
++configure:3265: result: yes
++configure:3416: checking for g++
++configure:3432: found /usr/bin/g++
++configure:3443: result: g++
++configure:3470: checking for C++ compiler version
++configure:3479: g++ --version >&5
++g++ (Gentoo 4.3.5 p1.0, pie-10.1.5) 4.3.5
++Copyright (C) 2008 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++configure:3490: $? = 0
++configure:3479: g++ -v >&5
++Using built-in specs.
++Reading specs from /usr/lib/gcc/x86_64-pc-linux-gnu/4.3.5/asneeded.specs
++Target: x86_64-pc-linux-gnu
++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'
++Thread model: posix
++gcc version 4.3.5 (Gentoo 4.3.5 p1.0, pie-10.1.5)
++configure:3490: $? = 0
++configure:3479: g++ -V >&5
++g++: '-V' option must have argument
++configure:3490: $? = 1
++configure:3479: g++ -qversion >&5
++g++: unrecognized option '-qversion'
++g++: no input files
++configure:3490: $? = 1
++configure:3510: checking whether the C++ compiler works
++configure:3532: g++ conftest.cpp >&5
++
++## ---------------- ##
++## Cache variables. ##
++## ---------------- ##
++
++ac_cv_env_CCC_set=
++ac_cv_env_CCC_value=
++ac_cv_env_CC_set=
++ac_cv_env_CC_value=
++ac_cv_env_CFLAGS_set=
++ac_cv_env_CFLAGS_value=
++ac_cv_env_CPPFLAGS_set=
++ac_cv_env_CPPFLAGS_value=
++ac_cv_env_CPP_set=
++ac_cv_env_CPP_value=
++ac_cv_env_CXXCPP_set=
++ac_cv_env_CXXCPP_value=
++ac_cv_env_CXXFLAGS_set=
++ac_cv_env_CXXFLAGS_value=
++ac_cv_env_CXX_set=
++ac_cv_env_CXX_value=
++ac_cv_env_LDFLAGS_set=
++ac_cv_env_LDFLAGS_value=
++ac_cv_env_LIBS_set=
++ac_cv_env_LIBS_value=
++ac_cv_env_build_alias_set=
++ac_cv_env_build_alias_value=
++ac_cv_env_host_alias_set=
++ac_cv_env_host_alias_value=
++ac_cv_env_target_alias_set=
++ac_cv_env_target_alias_value=
++ac_cv_path_install='/usr/bin/install -c'
++ac_cv_path_mkdir=/bin/mkdir
++ac_cv_prog_AWK=gawk
++ac_cv_prog_ac_ct_CXX=g++
++ac_cv_prog_make_make_set=yes
++
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++
++ACLOCAL='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run aclocal-1.11'
++ADDEXA_FALSE=''
++ADDEXA_TRUE=''
++ADOLC_PATCHLEVEL=''
++ADOLC_SUBVERSION=''
++ADOLC_VERSION=''
++AMDEPBACKSLASH=''
++AMDEP_FALSE=''
++AMDEP_TRUE=''
++AMTAR='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run tar'
++AM_MAKEFLAGS=''
++AR=''
++AS=''
++AUTOCONF='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run autoconf'
++AUTOHEADER='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run autoheader'
++AUTOMAKE='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run automake-1.11'
++AWK='gawk'
++CC=''
++CCDEPMODE=''
++CFLAGS=''
++COLPACK_CFLAGS=''
++COLPACK_LIBS=''
++CPP=''
++CPPFLAGS=''
++CXX='g++'
++CXXCPP=''
++CXXDEPMODE=''
++CXXFLAGS=''
++CYGPATH_W='echo'
++DEFS=''
++DEPDIR=''
++DLLTOOL=''
++DOCEXA_FALSE=''
++DOCEXA_TRUE=''
++DOLT_BASH=''
++DSYMUTIL=''
++DUMPBIN=''
++ECHO_C=''
++ECHO_N='-n'
++ECHO_T=''
++EGREP=''
++EXEEXT=''
++F77=''
++FC=''
++FGREP=''
++GREP=''
++HAVE_LIBCOLPACK_FALSE=''
++HAVE_LIBCOLPACK_TRUE=''
++INSTALL_DATA='${INSTALL} -m 644'
++INSTALL_PROGRAM='${INSTALL}'
++INSTALL_SCRIPT='${INSTALL}'
++INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
++LD=''
++LDFLAGS=''
++LIBOBJS=''
++LIBS=''
++LIBTOOL=''
++LIPO=''
++LN_S=''
++LTCOMPILE=''
++LTCXXCOMPILE=''
++LTLIBOBJS=''
++MAKEFLAGS=''
++MAKEINFO='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/missing --run makeinfo'
++MCS=''
++MKDIR_P='/bin/mkdir -p'
++NM=''
++NMEDIT=''
++OBJC=''
++OBJDUMP=''
++OBJEXT=''
++OTOOL64=''
++OTOOL=''
++PACKAGE='adolc'
++PACKAGE_BUGREPORT='adol-c@list.coin-or.org'
++PACKAGE_NAME='adolc'
++PACKAGE_STRING='adolc 2.1.12'
++PACKAGE_TARNAME='adolc'
++PACKAGE_URL=''
++PACKAGE_VERSION='2.1.12'
++PAREXA_FALSE=''
++PAREXA_TRUE=''
++PATH_SEPARATOR=':'
++Q=''
++RANLIB=''
++SED=''
++SET_MAKE=''
++SHELL='/bin/sh'
++SPARSE_FALSE=''
++SPARSE_TRUE=''
++STRIP=''
++V=''
++VERSION='2.1.12'
++_lib=''
++ac_adolc_cflags=''
++ac_adolc_cxxflags=''
++ac_aux_dir='autoconf'
++ac_ct_CC=''
++ac_ct_CXX='g++'
++ac_ct_DUMPBIN=''
++am__EXEEXT_FALSE=''
++am__EXEEXT_TRUE=''
++am__fastdepCC_FALSE=''
++am__fastdepCC_TRUE=''
++am__fastdepCXX_FALSE=''
++am__fastdepCXX_TRUE=''
++am__include=''
++am__isrc=''
++am__leading_dot='.'
++am__quote=''
++am__tar='${AMTAR} chof - "$$tardir"'
++am__untar='${AMTAR} xf -'
++bindir='${exec_prefix}/bin'
++build=''
++build_alias=''
++build_cpu=''
++build_os=''
++build_vendor=''
++datadir='${datarootdir}'
++datarootdir='${prefix}/share'
++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
++dvidir='${docdir}'
++exec_prefix='NONE'
++host=''
++host_alias=''
++host_cpu=''
++host_os=''
++host_vendor=''
++htmldir='${docdir}'
++includedir='${prefix}/include'
++infodir='${datarootdir}/info'
++install_sh='${SHELL} /home/seb/gentoo/bicatali/sci-libs/adolc/ADOL-C-2.1.12/autoconf/install-sh'
++libdir='${exec_prefix}/lib'
++libexecdir='${exec_prefix}/libexec'
++localedir='${datarootdir}/locale'
++localstatedir='${prefix}/var'
++lt_ECHO='echo'
++mandir='${datarootdir}/man'
++mkdir_p='/bin/mkdir -p'
++oldincludedir='/usr/include'
++pdfdir='${docdir}'
++prefix='NONE'
++program_transform_name='s,x,x,'
++psdir='${docdir}'
++sbindir='${exec_prefix}/sbin'
++sharedstatedir='${prefix}/com'
++shavedir=''
++sysconfdir='${prefix}/etc'
++target_alias=''
++
++## ----------- ##
++## confdefs.h. ##
++## ----------- ##
++
++/* confdefs.h */
++#define PACKAGE_NAME "adolc"
++#define PACKAGE_TARNAME "adolc"
++#define PACKAGE_VERSION "2.1.12"
++#define PACKAGE_STRING "adolc 2.1.12"
++#define PACKAGE_BUGREPORT "adol-c@list.coin-or.org"
++#define PACKAGE_URL ""
++#define PACKAGE "adolc"
++#define VERSION "2.1.12"
++
++configure: caught signal 2
++configure: exit 1
+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/adolc-2.1.12-sparse-openmp.patch b/sci-libs/adolc/files/adolc-2.1.12-sparse-openmp.patch
new file mode 100644
index 0000000..241517c
--- /dev/null
+++ b/sci-libs/adolc/files/adolc-2.1.12-sparse-openmp.patch
@@ -0,0 +1,20 @@
+--- 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
new file mode 100644
index 0000000..e5dda79
--- /dev/null
+++ b/sci-libs/adolc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+ 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.
+</longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/adolc/files/, sci-libs/adolc/
@ 2012-07-03 16:23 Sebastien Fabbro
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 16:23 UTC (permalink / raw
To: gentoo-commits
commit: f35a78008b8578a5bc41e03e3b3014fe13965b45
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jul 3 16:13:02 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 16:13:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=f35a7800
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, 0 insertions(+), 255 deletions(-)
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 <bicatali@gentoo.org> +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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
- 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.
-</longdescription>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-03 16:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-03 16:23 [gentoo-commits] dev/bicatali:master commit in: sci-libs/adolc/files/, sci-libs/adolc/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2011-03-31 18:11 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox