forked from spack/spack
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
libhio: add libhio package to spack (spack#7468)
spack brought out some configury/make issues with libhio, so some patches come along for the ride. Signed-off-by: Howard Pritchard <[email protected]>
- Loading branch information
1 parent
4c61999
commit cdd3f76
Showing
3 changed files
with
118 additions
and
6 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
...spack/repos/builtin/packages/libhio/0001-configury-fix-a-problem-with-bz2-configury.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
From 3a7b7432a7354661d0a971b074c30529f5db457c Mon Sep 17 00:00:00 2001 | ||
From: Howard Pritchard <[email protected]> | ||
Date: Sat, 10 Mar 2018 13:51:41 -0800 | ||
Subject: [PATCH] configury: fix a problem with bz2 configury | ||
|
||
turns out by default spack wants to use a non-default | ||
location bz2, or we have to turn it off. either way | ||
the bz2 configury is wrong and needs to be fixed. | ||
|
||
Signed-off-by: Howard Pritchard <[email protected]> | ||
|
||
diff --git a/m4/hio_check_bz2.m4 b/m4/hio_check_bz2.m4 | ||
index 3a373ad1..b7dfdb75 100644 | ||
--- a/m4/hio_check_bz2.m4 | ||
+++ b/m4/hio_check_bz2.m4 | ||
@@ -1,9 +1,9 @@ | ||
# -*- mode: shell-script -*- | ||
-# Copyright 2015-2016 Los Alamos National Security, LLC. All rights | ||
+# Copyright 2015-2018 Los Alamos National Security, LLC. All rights | ||
# reserved. | ||
|
||
AC_DEFUN([HIO_CHECK_BZ2],[ | ||
- AC_ARG_WITH(bz2, [AS_HELP_STRING([--with-external-bz2=PATH], | ||
+ AC_ARG_WITH(external-bz2, [AS_HELP_STRING([--with-external_bz2=PATH], | ||
[use external bzip2. pass yes to use default version @<:@default=no@:>@])], | ||
[], [with_external_bz2=no]) | ||
|
||
@@ -14,6 +14,7 @@ AC_DEFUN([HIO_CHECK_BZ2],[ | ||
else | ||
LDFLAGS="$LDFLAGS -L$with_external_bz2/lib64" | ||
fi | ||
+ LIBS="$LIBS -lbz2" | ||
fi | ||
|
||
AC_CHECK_LIB([bz2],[BZ2_bzBuffToBuffCompress],[hio_have_bz2=1]) | ||
-- | ||
2.4.0.rc3.16.g0ab00b9 | ||
|
37 changes: 37 additions & 0 deletions
37
var/spack/repos/builtin/packages/libhio/0001-hdf5-make-docs-optional.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 6aec1b94fe84f2fe3a82e3ff338fd4721c84db34 Mon Sep 17 00:00:00 2001 | ||
From: Howard Pritchard <[email protected]> | ||
Date: Mon, 12 Mar 2018 14:19:28 -0700 | ||
Subject: [PATCH] hdf5: make docs optional | ||
|
||
With the current makefile, configuring in hdf5 | ||
hio plugin always ends up trying to generate docs. | ||
Make generating hdf5/hio plugin docs optional with | ||
|
||
make docs | ||
|
||
Signed-off-by: Howard Pritchard <[email protected]> | ||
|
||
diff --git a/hdf5-hio/Makefile.am b/hdf5-hio/Makefile.am | ||
index e4c93b77..1733866d 100644 | ||
--- a/hdf5-hio/Makefile.am | ||
+++ b/hdf5-hio/Makefile.am | ||
@@ -1,6 +1,6 @@ | ||
# -*- Makefile.am -*- | ||
# | ||
-# Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights | ||
+# Copyright (c) 2014-2018 Los Alamos National Security, LLC. All rights | ||
# reserved. | ||
# $COPYRIGHT$ | ||
# | ||
@@ -11,7 +11,7 @@ | ||
|
||
ACLOCAL_AMFLAGS=-I m4 | ||
|
||
-SUBDIRS = src test doc | ||
+SUBDIRS = src test | ||
|
||
EXTRA_DIST = | ||
DISTCLEANFILES = | ||
-- | ||
2.4.0.rc3.16.g0ab00b9 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters