Commit 809d3fe1 authored by Rob Latham's avatar Rob Latham
Browse files

bump pmem to 1.4 and disable doc build

new version addresses a build error on Ubuntu-18.04 and disabled docs
fix a build error on some docker images
parent 70c3881a
From 750e9d9dac52af483dc556be80f1f69bc522e5be Mon Sep 17 00:00:00 2001
From: Rob Latham <robl@mcs.anl.gov>
Date: Tue, 8 May 2018 15:48:49 -0500
Subject: [PATCH] make doc building explicit
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7f2417d9..b29672b3 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ clean:
clobber:
$(MAKE) -C src $@
- $(MAKE) -C doc $@
+ #$(MAKE) -C doc $@
$(MAKE) -C utils $@
$(RM) -r $(RPM_BUILDDIR) $(DPKG_BUILDDIR) rpm dpkg
@@ -142,7 +142,7 @@ rpm dpkg: pkg-clean source
install uninstall:
$(MAKE) -C src $@
- $(MAKE) -C doc $@
+ #$(MAKE) -C doc $@
.PHONY: all clean clobber test check cstyle check-license install uninstall\
source rpm dpkg pkg-clean pcheck check-remote format doc $(SUBDIRS)
--
2.17.0
...@@ -30,15 +30,17 @@ class Pmem(Package): ...@@ -30,15 +30,17 @@ class Pmem(Package):
"""The NVM Library is a library for using memory-mapped persistence, optimized specifically for persistent memory""" """The NVM Library is a library for using memory-mapped persistence, optimized specifically for persistent memory"""
homepage = "http://pmem.io/" homepage = "http://pmem.io/"
url = "https://github.com/pmem/nvml/archive/1.3.tar.gz" url = "https://github.com/pmem/nvml/archive/1.4.tar.gz"
# in the nvml -> pmdk name change, these hashes needed to be updated # in the nvml -> pmdk name change, these hashes needed to be updated
version('1.4', '8813455d9518b8d7e0c296a706314940')
version('1.3', '32c41d0d7f1c855b7d2b9622631a6bc3') version('1.3', '32c41d0d7f1c855b7d2b9622631a6bc3')
# experimental rpmem # experimental rpmem
depends_on('libfabric@1.4.2:') depends_on('libfabric@1.4.2:')
# gcc7 warns about buffer overflows # documentation requires doxygen and a bunch of other depenedncies that
patch('0001-benchmark-fix-buffer-overflow-in-rpmem_persist.patch') # were not working properly on our contianers
patch('0001-make-doc-building-explicit.patch')
def install(self, spec, prefix): def install(self, spec, prefix):
make("install", "prefix=%s" % prefix) make("install", "prefix=%s" % prefix)
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