From b091fcdb8e8bf9c96e33bcbee23571d28c512534 Mon Sep 17 00:00:00 2001 From: "Elsa Gonsiorowski, PhD" Date: Tue, 18 Dec 2018 19:51:24 -0800 Subject: 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 --- .../repos/builtin/packages/mpifileutils/package.py | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/mpifileutils/package.py b/var/spack/repos/builtin/packages/mpifileutils/package.py index 085bc61543..5adaac1c20 100644 --- a/var/spack/repos/builtin/packages/mpifileutils/package.py +++ b/var/spack/repos/builtin/packages/mpifileutils/package.py @@ -26,6 +26,8 @@ class Mpifileutils(AutotoolsPackage): version('0.7', 'c081f7f72c4521dddccdcf9e087c5a2b') version('0.6', '620bcc4966907481f1b1a965b28fc9bf') + conflicts('platform=darwin') + depends_on('mpi') depends_on('libcircle') depends_on('lwgrp') @@ -51,6 +53,21 @@ class Mpifileutils(AutotoolsPackage): def configure_args(self): 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: args.append('--enable-lustre') @@ -62,12 +79,4 @@ class Mpifileutils(AutotoolsPackage): args.append('--enable-experimental') else: args.append('--disable-experimental') - return args - - @property - def build_targets(self): - targets = [] - if '+xattr' in self.spec: - targets.append('CFLAGS=-DDCOPY_USE_XATTRS') - return targets -- cgit v1.2.3-60-g2f50