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

Make gettext find libxml2 (#23393)

Browse Source 
gettext uses a test with <libxml2/libxml/someheader.h> to locate a header,
and libxml2 itself includes <libxml/otherheader.h>, so both have to be
in the include path.
This commit is contained in:
Harmen Stoppels 2021-05-03 17:03:35 +02:00 committed by GitHub
parent 9c1c7ab6ca
commit 74ed861657
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
var/spack/repos/builtin/packages/gettext/package.py
View File

@ -73,10 +73,8 @@ def configure_args(self):
config_args.append('--disable-curses') config_args.append('--disable-curses')
if '+libxml2' in spec: if '+libxml2' in spec:
config_args.append('CPPFLAGS=-I{0}/include'.format( config_args.append('--with-libxml2-prefix={0}'.format(
spec['libxml2'].prefix)) spec['libxml2'].prefix))
config_args.append('LDFLAGS=-L{0} -Wl,-rpath,{0}'.format(
spec['libxml2'].libs.directories[0]))
else: else:
config_args.append('--with-included-libxml') config_args.append('--with-included-libxml')

2
var/spack/repos/builtin/packages/libxml2/package.py
View File

@ -48,7 +48,7 @@ class Libxml2(AutotoolsPackage):
def headers(self): def headers(self):
include_dir = self.spec.prefix.include.libxml2 include_dir = self.spec.prefix.include.libxml2
hl = find_all_headers(include_dir) hl = find_all_headers(include_dir)
hl.directories = include_dir hl.directories = [include_dir, self.spec.prefix.include]
return hl return hl
def configure_args(self): def configure_args(self):