Commit ca14319b authored by Matthieu Dorier's avatar Matthieu Dorier
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:sds/sds-repo

parents a60dc4bf 3bcbe770
......@@ -35,7 +35,8 @@ class Bake(AutotoolsPackage):
# dev-file-backend version still requires remi until it is rebased
depends_on('remi@0.2.2:', when='@dev-file-backend')
depends_on('libuuid')
depends_on('pmdk')
# this spec prevents @dev-file-backend from depending on pmdk
depends_on('pmdk', when='@0.0.0:')
depends_on('jsoncpp@1.9.1:', when='+benchmark')
depends_on('mpi', when='+benchmark')
......
......@@ -19,9 +19,11 @@ class Benvolio(AutotoolsPackage):
depends_on('automake')
depends_on('autoconf')
depends_on('libtool')
depends_on('thallium@0.3.4:')
# thallium-0.5 provided engine::wrap()
depends_on('thallium@0.5:')
depends_on('abt-io@0.2:')
depends_on('ssg+mpi@0.2')
# pick up ssg API rework that landed in ssg-0.4.0
depends_on('ssg+mpi@0.4.0:')
def configure_args(self):
extra_args = []
......
......@@ -34,7 +34,8 @@ class Ior(AutotoolsPackage):
depends_on('hdf5+mpi', when='+hdf5')
depends_on('parallel-netcdf', when='+ncmpi')
depends_on('mobject', when='+mobject')
# depend on latest mobject to bring in latest bake
depends_on('mobject@develop', when='+mobject')
patch('0001-DO-NOT-MERGE-mobject-specific-hackery.patch', when='+mobject')
......
......@@ -44,15 +44,15 @@ class Mobject(AutotoolsPackage):
depends_on('margo@0.4:')
depends_on('mpi')
depends_on('ssg+mpi@0.2', when='@:0.3')
depends_on('ssg+mpi@0.4.0:', when='@0.4')
depends_on('ssg+mpi@0.4.0:', when='@0.4:')
depends_on('ch-placement@0.1:')
depends_on('autoconf')
depends_on('automake')
depends_on('libtool')
depends_on('sdskeyval@0.1:')
depends_on('bake@0.1:')
depends_on('bake@0.3:0.3.6', when='@0.3:')
depends_on('bake@0.4:', when='@0.4.2:')
depends_on('bake@0.3:0.3.6', when='@:0.4.1')
depends_on('bake@0.4:', when='@0.4.2:');
patch('0001-crude-timing-information.patch', when="+timing")
......
From e00e00028e6cf42f03e08e6255c6a9bd190123ae Mon Sep 17 00:00:00 2001
From: Rob Latham <robl@mcs.anl.gov>
Date: Wed, 5 Feb 2020 08:40:33 -0600
Subject: [PATCH] update missing configure macros
---
autogen | 2 +-
config/ax_require_defined.m4 | 37 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 config/ax_require_defined.m4
diff --git a/autogen b/autogen
index 5b3b9871..4a59dbfe 100755
--- a/autogen
+++ b/autogen
@@ -8,6 +8,6 @@
# top-level directory of this distribution.
#
-autoreconf --force --install
+autoreconf --force --install -Iconfig
exit $?
diff --git a/config/ax_require_defined.m4 b/config/ax_require_defined.m4
new file mode 100644
index 00000000..17c3eab7
--- /dev/null
+++ b/config/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+# been defined and thus are available for use. This avoids random issues
+# where a macro isn't expanded. Instead the configure script emits a
+# non-fatal:
+#
+# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+# It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+# Here's an example:
+#
+# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 2
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+ m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
--
2.17.1
......@@ -30,17 +30,25 @@ class Sdsdkv(AutotoolsPackage):
homepage = "https://xgitlab.cels.anl.gov/sds/sdsdkv"
url = "https://xgitlab.cels.anl.gov/sds/sdsdkv"
git = 'git@xgitlab.cels.anl.gov:sds/sdsdkv.git'
version('master', git='https://xgitlab.cels.anl.gov/sds/sdsdkv.git')
version('master', branch='master')
version('0.1', tag='v0.1')
depends_on('autoconf@2.65:')
depends_on('automake@1.13.4:')
depends_on('libtool', type=("build"))
depends_on('sdskeyval +leveldb~bwtree~bdb')
depends_on('ssg+mpi@0.2')
depends_on('ssg+mpi@0.2', when='@0.1')
depends_on('ch-placement')
patch('0001-update-missing-configure-macros.patch', when='@0.1')
def autoreconf(self, spec, prefix):
autogen = Executable('./autogen')
autogen()
def configure_args(self):
return [
'CXX={0}'.format(self.spec['mpi'].mpicxx)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment