[gentoo-commits] gentoo-x86 commit in sci-libs/adolc/files: adolc-2.5.0-no-colpack.patch adolc-2.5.2-dash.patch

[Justin Lecher (jlec)]

jlec        14/10/31 08:22:10

  Modified:             adolc-2.5.0-no-colpack.patch
  Added:                adolc-2.5.2-dash.patch
  Log:
  sci-libs/adolc: Version BUmp; fix installation with /bin/sh -> dash; #527492
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

Revision  Changes    Path
1.2                  sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch?r1=1.1&r2=1.2

Index: adolc-2.5.0-no-colpack.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adolc-2.5.0-no-colpack.patch	21 May 2014 16:16:16 -0000	1.1
+++ adolc-2.5.0-no-colpack.patch	31 Oct 2014 08:22:10 -0000	1.2
@@ -1,15 +1,51 @@
---- autoconf/colpack.m4.orig	2014-05-21 09:01:30.749673830 -0700
-+++ autoconf/colpack.m4	2014-05-21 09:01:30.749673830 -0700
-@@ -21,7 +21,7 @@
+ 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"
-@@ -56,6 +56,9 @@
+@@ -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++])



1.1                  sci-libs/adolc/files/adolc-2.5.2-dash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/adolc/files/adolc-2.5.2-dash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/adolc/files/adolc-2.5.2-dash.patch?rev=1.1&content-type=text/plain

Index: adolc-2.5.2-dash.patch
===================================================================
 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