Skip to content
Snippets Groups Projects
Commit b091fcdb authored by Elsa Gonsiorowski, PhD's avatar Elsa Gonsiorowski, PhD Committed by Adam J. Stewart
Browse files

fix for mpifileutils package (#10142)

* proper include & linking of libarchive

* due to linux headers, mfu can't build on mac

* hard code deps in configure line

rather than relying on pkg-config

* +xattr during config

* must also link the lib

* find mfu.h

* long lines
parent b27f81ac
Branches
Tags
No related merge requests found
...@@ -26,6 +26,8 @@ class Mpifileutils(AutotoolsPackage): ...@@ -26,6 +26,8 @@ class Mpifileutils(AutotoolsPackage):
version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b')
version('0.6', '620bcc4966907481f1b1a965b28fc9bf') version('0.6', '620bcc4966907481f1b1a965b28fc9bf')
conflicts('platform=darwin')
depends_on('mpi') depends_on('mpi')
depends_on('libcircle') depends_on('libcircle')
depends_on('lwgrp') depends_on('lwgrp')
...@@ -51,6 +53,21 @@ class Mpifileutils(AutotoolsPackage): ...@@ -51,6 +53,21 @@ class Mpifileutils(AutotoolsPackage):
def configure_args(self): def configure_args(self):
args = [] args = []
args.append("CPPFLAGS=-I%s/src/common" % pwd())
args.append("libarchive_CFLAGS=-I%s"
% self.spec['libarchive'].prefix.include)
args.append("libarchive_LIBS=%s %s"
% (self.spec['libarchive'].libs.search_flags,
self.spec['libarchive'].libs.link_flags))
args.append("libcircle_CFLAGS=-I%s"
% self.spec['libcircle'].prefix.include)
args.append("libcircle_LIBS=%s %s"
% (self.spec['libcircle'].libs.search_flags,
self.spec['libcircle'].libs.link_flags))
args.append("--with-dtcmp=%s" % self.spec['dtcmp'].prefix)
if '+xattr' in self.spec:
args.append('CFLAGS=-DDCOPY_USE_XATTRS')
if '+lustre' in self.spec: if '+lustre' in self.spec:
args.append('--enable-lustre') args.append('--enable-lustre')
...@@ -62,12 +79,4 @@ def configure_args(self): ...@@ -62,12 +79,4 @@ def configure_args(self):
args.append('--enable-experimental') args.append('--enable-experimental')
else: else:
args.append('--disable-experimental') args.append('--disable-experimental')
return args return args
@property
def build_targets(self):
targets = []
if '+xattr' in self.spec:
targets.append('CFLAGS=-DDCOPY_USE_XATTRS')
return targets
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment