zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtirpc: Fix directories returned for header files (#23332)

Browse Source 
libtirpc puts its header files under prefix/include/tirpc, but
spack was returning just prefix/include for location of headers.

This will cause spack to return both prefix/include and
prefix/include/tirpc for headers, so both

include <rpc/xdr.h>

or

include <tirpc/rpc/xdr.h>

should work.
This commit is contained in:
Tom Payerle 2021-04-28 18:08:42 -04:00 committed by GitHub
parent 239e8db319
commit c0e53827aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/libtirpc/package.py
View File

@ -11,7 +11,7 @@ class Libtirpc(AutotoolsPackage):
""" """
homepage = "https://sourceforge.net/projects/libtirpc/" homepage = "https://sourceforge.net/projects/libtirpc/"
url = "https://sourceforge.net/projects/libtirpc/files/libtirpc/1.1.4/libtirpc-1.1.4.tar.bz2/download" url = "https://sourceforge.net/projects/libtirpc/files/libtirpc/1.1.4/libtirpc-1.1.4.tar.bz2/download"
version('1.2.6', sha256='4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc') version('1.2.6', sha256='4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc')
version('1.1.4', sha256='2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d') version('1.1.4', sha256='2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d')
@ -23,3 +23,13 @@ class Libtirpc(AutotoolsPackage):
# FIXME: build error on macOS # FIXME: build error on macOS
# auth_none.c:81:9: error: unknown type name 'mutex_t' # auth_none.c:81:9: error: unknown type name 'mutex_t'
conflicts('platform=darwin', msg='Does not build on macOS') conflicts('platform=darwin', msg='Does not build on macOS')
@property
def headers(self):
hdrs = find_all_headers(self.prefix.include)
# libtirpc puts headers under include/tirpc, but some codes (e.g. hdf)
# do not expect a tirpc component. Since some might, we return
# both prefix.include.tirpc and prefix.include as header paths
if hdrs:
hdrs.directories = [self.prefix.include.tirpc, self.prefix.include]
return hdrs or None