aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2017-04-20 22:06:00 -0500
committerEric Bavier <bavier@member.fsf.org>2017-04-20 22:06:00 -0500
commitf920e79426f51f1320dd4ffc164fc473df2158c3 (patch)
tree6243bd43bdb4f7ce6a6b98e6f5321353e2e04f7f
parent2dce88d5bbe7a65e101c0734d1c6db44ecc8c299 (diff)
downloadgnu-guix-f920e79426f51f1320dd4ffc164fc473df2158c3.tar
gnu-guix-f920e79426f51f1320dd4ffc164fc473df2158c3.tar.gz
gnu: hypre: Delete unused patches.
* gnu/packages/patches/hypre-doc-tables.patch, gnu/packages/patches/hypre-ldflags.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove them.
-rw-r--r--gnu/local.mk2
-rw-r--r--gnu/packages/patches/hypre-doc-tables.patch25
-rw-r--r--gnu/packages/patches/hypre-ldflags.patch9
3 files changed, 0 insertions, 36 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index f38126251f..d7dadf8296 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -653,8 +653,6 @@ dist_patch_DATA = \
%D%/packages/patches/hop-linker-flags.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
- %D%/packages/patches/hypre-doc-tables.patch \
- %D%/packages/patches/hypre-ldflags.patch \
%D%/packages/patches/icecat-avoid-bundled-libraries.patch \
%D%/packages/patches/icecat-binutils.patch \
%D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
diff --git a/gnu/packages/patches/hypre-doc-tables.patch b/gnu/packages/patches/hypre-doc-tables.patch
deleted file mode 100644
index 6a852ee78e..0000000000
--- a/gnu/packages/patches/hypre-doc-tables.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fixes doc++'s treatment of tabular within a parameter block.
-
-From commit 883925f8a at http://github.com/LLNL/hypre
-
---- hypre-2.10.1/src/parcsr_ls/HYPRE_parcsr_ls.h 2015-12-04 22:12:19.000000000 -0600
-+++ hypre-2.10.1/src/parcsr_ls/HYPRE_parcsr_ls.h 2016-03-16 09:02:58.547501336 -0500
-@@ -1154,8 +1154,6 @@
- * Set the symmetry parameter for the
- * ParaSails preconditioner.
- *
-- * @param solver [IN] Preconditioner object for which to set symmetry parameter.
-- * @param sym [IN] Value of the symmetry parameter:
- * \begin{tabular}{|c|l|} \hline
- * value & meaning \\ \hline
- * 0 & nonsymmetric and/or indefinite problem, and nonsymmetric preconditioner\\
-@@ -1163,6 +1161,9 @@
- * 2 & nonsymmetric, definite problem, and SPD (factored) preconditioner \\
- * \hline
- * \end{tabular}
-+ *
-+ * @param solver [IN] Preconditioner object for which to set symmetry parameter.
-+ * @param sym [IN] Value of the symmetry parameter:
- **/
- HYPRE_Int HYPRE_ParaSailsSetSym(HYPRE_Solver solver,
- HYPRE_Int sym);
diff --git a/gnu/packages/patches/hypre-ldflags.patch b/gnu/packages/patches/hypre-ldflags.patch
deleted file mode 100644
index a94fafa463..0000000000
--- a/gnu/packages/patches/hypre-ldflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- hypre-2.10.1/src/lib/Makefile.orig 2016-03-11 16:04:03.740259228 -0600
-+++ hypre-2.10.1/src/lib/Makefile 2016-03-11 16:04:57.296260190 -0600
-@@ -107,5 +107,5 @@
-
- libHYPRE.so: ${FILES_HYPRE}
- @echo "Building $@ ... "
-- ${BUILD_CC_SHARED} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
-+ ${BUILD_CC_SHARED} ${LDFLAGS} -o ${SONAME} ${FILES_HYPRE} ${SOLIBS} ${SHARED_SET_SONAME}${SONAME} ${SHARED_OPTIONS}
- ln -s ${SONAME} $@