summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerban Maerean <serban@us.ibm.com>2018-06-13 18:53:14 -0400
committerscheibelp <scheibel1@llnl.gov>2018-06-13 15:53:14 -0700
commitee4050c58f7c76cf789a03d62a6ee613f8b1a34a (patch)
tree5ad806af096a6253982512e851a31f0544854dc6
parenteac8cf83bd0b4891c9bcb7d07b0ae48d6dc203e6 (diff)
downloadspack-ee4050c58f7c76cf789a03d62a6ee613f8b1a34a.tar.gz
spack-ee4050c58f7c76cf789a03d62a6ee613f8b1a34a.tar.bz2
spack-ee4050c58f7c76cf789a03d62a6ee613f8b1a34a.tar.xz
spack-ee4050c58f7c76cf789a03d62a6ee613f8b1a34a.zip
boost package: patch dirent for pgi and boost 1.67 (#8313)
-rw-r--r--var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch13
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py1
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch b/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch
new file mode 100644
index 0000000000..b2c7acaf6b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/boost/boost_1.67.0_pgi.patch
@@ -0,0 +1,13 @@
+--- a/libs/filesystem/src/operations.cpp
++++ b/libs/filesystem/src/operations.cpp
+@@ -2056,10 +2056,6 @@
+ return ok;
+ }
+
+-#if defined(__PGI) && defined(__USE_FILE_OFFSET64)
+-#define dirent dirent64
+-#endif
+-
+ error_code dir_itr_first(void *& handle, void *& buffer,
+ const char* dir, string& target,
+ fs::file_status &, fs::file_status &)
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index cc774b927b..5b8b621ba5 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -177,6 +177,7 @@ class Boost(Package):
patch('call_once_variadic.patch', when='@1.54.0:1.55.9999%gcc@5.0:5.9')
# Patch fix for PGI compiler
+ patch('boost_1.67.0_pgi.patch', when='@1.67.0%pgi')
patch('boost_1.63.0_pgi.patch', when='@1.63.0%pgi')
patch('boost_1.63.0_pgi_17.4_workaround.patch', when='@1.63.0%pgi@17.4')