~ruther/guix-local

f920e79426f51f1320dd4ffc164fc473df2158c3 — Eric Bavier 9 years ago 2dce88d
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.
3 files changed, 0 insertions(+), 36 deletions(-)

M gnu/local.mk
D gnu/packages/patches/hypre-doc-tables.patch
D gnu/packages/patches/hypre-ldflags.patch
M gnu/local.mk => gnu/local.mk +0 -2
@@ 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	\

D gnu/packages/patches/hypre-doc-tables.patch => gnu/packages/patches/hypre-doc-tables.patch +0 -25
@@ 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);

D gnu/packages/patches/hypre-ldflags.patch => gnu/packages/patches/hypre-ldflags.patch +0 -9
@@ 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} $@