summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch
downloadgentoo-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/adolc-2.5.0-no-colpack.patch')
-rw-r--r--sci-libs/adolc/files/adolc-2.5.0-no-colpack.patch57
1 files changed, 57 insertions, 0 deletions
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