diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/adolc/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-libs/adolc/files')
-rw-r--r-- | sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch | 24 | ||||
-rw-r--r-- | sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch | 57 | ||||
-rw-r--r-- | sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch | 9 | ||||
-rw-r--r-- | sci-libs/adolc/files/adolc-2.5.2-dash.patch | 148 |
4 files changed, 238 insertions, 0 deletions
diff --git a/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch new file mode 100644 index 000000000000..e3b5a4a2ca5f --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.4.0-no-colpack.patch @@ -0,0 +1,24 @@ +do not test colpack when user says no even when it is installed + +--- configure.ac.orig 2012-07-19 13:04:37.426461811 -0700 ++++ configure.ac 2012-07-19 13:06:06.477916144 -0700 +@@ -281,7 +281,7 @@ + COLPACK_LIBDIR="" + COLPACK_LIBS="-lColPack" + ]) +- ++if test x$colpack != xno; then + AC_LANG_PUSH([C++]) + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" +@@ -301,7 +301,9 @@ + CPPFLAGS="$save_CPPFLAGS" + LIBS="$save_LIBS" + 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 + sparse=yes diff --git a/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch b/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch new file mode 100644 index 000000000000..779890c8cf2b --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch @@ -0,0 +1,57 @@ + autoconf/colpack.m4 | 23 +++++++++++++---------- + 1 file changed, 13 insertions(+), 10 deletions(-) + +diff --git a/autoconf/colpack.m4 b/autoconf/colpack.m4 +index 9792786..bd4ba5e 100644 +--- a/autoconf/colpack.m4 ++++ b/autoconf/colpack.m4 +@@ -8,20 +8,20 @@ AC_ARG_WITH(colpack, + AS_HELP_STRING([--with-colpack=DIR],[path to the colpack library and headers [default=system libraries]])], + [ + colpack=$withval +-COLPACK_CFLAGS="-I$colpack/include" +-if test x${_lib} != xlib ; then +- D[[0]]="$colpack/${_lib}" +- D[[1]]="$colpack/lib" +-else +- D[[0]]="$colpack/${_lib}" +-fi + ], + [ + COLPACK_CFLAGS="" + COLPACK_LIBS="-lColPack" + D[[0]]="" + ]) +- ++if test x$colpack != xno; then ++COLPACK_CFLAGS="-I$colpack/include" ++if test x${_lib} != xlib ; then ++ D[[0]]="$colpack/${_lib}" ++ D[[1]]="$colpack/lib" ++else ++ D[[0]]="$colpack/${_lib}" ++fi + AC_LANG_PUSH([C++]) + save_CXXFLAGS="$CXXFLAGS" + save_CPPFLAGS="$CPPFLAGS" +@@ -33,8 +33,8 @@ have_colpackheaders=no + CPPFLAGS="$save_CPPFLAGS" + CXXFLAGS="$save_CXXFLAGS" + ]) +-for ((i=0; i < ${#D[@]} ; i++)); do +-COLPACK_LIBDIR="${D[[$i]]}" ++for i in ${D[@]}; do ++COLPACK_LIBDIR="${i}" + if test -n "$COLPACK_LIBDIR" ; then + COLPACK_LIBS="-L$COLPACK_LIBDIR -lColPack -Wl,-rpath,$COLPACK_LIBDIR" + fi +@@ -56,6 +56,9 @@ else + 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 diff --git a/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch b/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch new file mode 100644 index 000000000000..4a6296e2db75 --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.5.0-pkgconfig-no-ldflags.patch @@ -0,0 +1,9 @@ +--- adolclib.pc.in.orig 2014-05-21 09:09:10.060824555 -0700 ++++ adolclib.pc.in 2014-05-21 09:09:10.060824555 -0700 +@@ -7,5 +7,5 @@ + Version: @PACKAGE_VERSION@ + Description: Algorithmic Differentiation Library for C/C++ + Requires: +-Libs: -L${libdir} -l@adolclib@ -Wl,-rpath,${libdir} @LDFLAGS@ @LIBS@ ++Libs: -L${libdir} -l@adolclib@ @LIBS@ + Cflags: -I${includedir} diff --git a/sci-libs/adolc/files/adolc-2.5.2-dash.patch b/sci-libs/adolc/files/adolc-2.5.2-dash.patch new file mode 100644 index 000000000000..3aa5a3035a14 --- /dev/null +++ b/sci-libs/adolc/files/adolc-2.5.2-dash.patch @@ -0,0 +1,148 @@ + configure.ac | 45 +++++++++++++++++---------------------------- + 1 file changed, 17 insertions(+), 28 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 926832c..1310025 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,12 +29,12 @@ AM_SILENT_RULES([yes]) + + adolclib=adolc + +-if test "x$CFLAGS" == x ; then ++if test "x$CFLAGS" = x ; then + ac_shell_cflags="not_set" + else + ac_shell_cflags="$CFLAGS" + fi +-if test "x$CXXFLAGS" == x ; then ++if test "x$CXXFLAGS" = x ; then + ac_shell_cxxflags="not_set" + else + ac_shell_cxxflags="$CXXFLAGS" +@@ -225,12 +225,12 @@ AS_HELP_STRING([--enable-harddebug],[enable ADOL-C hard debug mode + AC_MSG_RESULT(no) + ]) + +-if test x$adolc_harddebug == xyes ; then ++if test x$adolc_harddebug = xyes ; then + adolc_debug=yes + AC_DEFINE(ADOLC_HARDDEBUG,1,[ADOL-C hard debug mode]) + fi + +-if test x$adolc_debug == xyes ; then ++if test x$adolc_debug = xyes ; then + AC_DEFINE(ADOLC_DEBUG,1,[ADOL-C debug mode]) + fi + +@@ -248,7 +248,7 @@ AS_HELP_STRING([--disable-stdczero],[adouble default constructor does not initia + AC_MSG_RESULT(yes) + ]) + +-if test x$adolc_stdczero == xyes; then ++if test x$adolc_stdczero = xyes; then + AC_DEFINE(ADOLC_ADOUBLE_STDCZERO,1,[ADOL-C adouble zeroing mode]) + fi + +@@ -265,7 +265,7 @@ AS_HELP_STRING([--enable-lateinit],[adouble constructors need to be called. With + AC_MSG_RESULT(no) + ]) + +-if test x$adolc_late_init == xyes; then ++if test x$adolc_late_init = xyes; then + AC_DEFINE(ADOLC_ADOUBLE_LATEINIT,1,[ADOL-C adouble late initialization mode]) + fi + +@@ -282,7 +282,7 @@ AS_HELP_STRING([--enable-tserrno],[use errno as thread number cache [default=no] + AC_MSG_RESULT(no) + ]) + +-if test x$adolc_tserrno == xyes ; then ++if test x$adolc_tserrno = xyes ; then + AC_DEFINE(ADOLC_THREADSAVE_ERRNO,1,[ADOL-C thread save errno mode]) + fi + +@@ -351,8 +351,8 @@ AC_ARG_WITH(cflags, + [AS_HELP_STRING([--with-cflags=FLAGS], + [use CFLAGS=FLAGS (default: -O2)])], + [ac_adolc_cflags="$withval" +- if test x${adolc_debug} == xyes || +- test x${adolc_harddebug} == xyes ; then ++ if test "x${adolc_debug}" = xyes || ++ test "x${adolc_harddebug}" = xyes ; then + ac_adolc_cflags="$ac_adolc_cflags -g -O0" + fi + ac_adolc_cflags="$ac_adolc_cflags $ac_adolc_openmpflag" +@@ -360,8 +360,8 @@ AC_ARG_WITH(cflags, + AC_MSG_RESULT($ac_adolc_cflags)], + [if test "$ac_shell_cflags" = "not_set"; then + ac_adolc_cflags="-O2" +- if test x${adolc_debug} == xyes || +- test x${adolc_harddebug} == xyes ; then ++ if test "x${adolc_debug}" = xyes || ++ test "x${adolc_harddebug}" = xyes ; then + ac_adolc_cflags="-g -O0 -Wall -ansi" + fi + else +@@ -377,8 +377,8 @@ AC_ARG_WITH(cxxflags, + [AS_HELP_STRING([--with-cxxflags=FLAGS], + [use CXXFLAGS=FLAGS (default: -O2)])], + [ac_adolc_cxxflags="$withval" +- if test x${adolc_debug} == xyes || +- test x${adolc_harddebug} == xyes ; then ++ if test x${adolc_debug} = xyes || ++ test x${adolc_harddebug} = xyes ; then + ac_adolc_cxxflags="$ac_adolc_cxxflags -g -O0" + fi + ac_adolc_cxxflags="$ac_adolc_cxxflags $ac_adolc_openmpflag" +@@ -386,8 +386,8 @@ AC_ARG_WITH(cxxflags, + AC_MSG_RESULT($ac_adolc_cxxflags)], + [if test "$ac_shell_cxxflags" = "not_set"; then + ac_adolc_cxxflags="-O2" +- if test x${adolc_debug} == xyes || +- test x${adolc_harddebug} == xyes ; then ++ if test x${adolc_debug} = xyes || ++ test x${adolc_harddebug} = xyes ; then + ac_adolc_cxxflags="-g -O0 -Wall" + fi + else +@@ -420,7 +420,7 @@ AC_ARG_ENABLE(tapedoc_values, + ]) + AC_MSG_RESULT($tapedoc_values) + +-if test x$tapedoc_values == xyes; then ++if test x$tapedoc_values = xyes; then + AC_DEFINE(ADOLC_TAPE_DOC_VALUES,1,[ADOL-C tape_doc routine computes values]) + fi + +@@ -583,7 +583,7 @@ while test "x${pdir}" != "x/" ; do + break + fi + done +-if test "x${pdir}" == "x/" ; then ++if test "x${pdir}" = "x/" ; then + writable=false + fi + if ! ${writable} ; then +@@ -595,15 +595,6 @@ if ! ${writable} ; then + warn=true + fi + +-case ${prefix} in +- ${HOME}|${HOME}/*) +-if $warn ; then +- for (( i=5; i>0; i-- )); do +- echo -ne "\rPlease read the above messages carefully, continuing in ${i} seconds" +- sleep 1 +- done +- echo -e "\rPlease read the above messages carefully " +-fi + echo \ + " + ***************************************************************************** +@@ -629,5 +620,3 @@ echo \ + + ***************************************************************************** + " +-;; +-esac |