diff options
| author | Harmen Stoppels <harmenstoppels@gmail.com> | 2021-05-03 17:03:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 08:03:35 -0700 |
| commit | 74ed861657cf3cd85955ab99dd90f709286c8210 (patch) | |
| tree | 536b74b11cb88faf8cf95654945b99aa0c35585f | |
| parent | 9c1c7ab6cab1a7aac89220c1fdd694893b7fd729 (diff) | |
| download | spack-74ed861657cf3cd85955ab99dd90f709286c8210.tar.gz spack-74ed861657cf3cd85955ab99dd90f709286c8210.tar.bz2 spack-74ed861657cf3cd85955ab99dd90f709286c8210.tar.xz spack-74ed861657cf3cd85955ab99dd90f709286c8210.zip | |
Make gettext find libxml2 (#23393)
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.
| -rw-r--r-- | var/spack/repos/builtin/packages/gettext/package.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/libxml2/package.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/gettext/package.py b/var/spack/repos/builtin/packages/gettext/package.py index e184c89333..8cb7c04b19 100644 --- a/var/spack/repos/builtin/packages/gettext/package.py +++ b/var/spack/repos/builtin/packages/gettext/package.py @@ -73,10 +73,8 @@ class Gettext(AutotoolsPackage, GNUMirrorPackage): config_args.append('--disable-curses') if '+libxml2' in spec: - config_args.append('CPPFLAGS=-I{0}/include'.format( + config_args.append('--with-libxml2-prefix={0}'.format( spec['libxml2'].prefix)) - config_args.append('LDFLAGS=-L{0} -Wl,-rpath,{0}'.format( - spec['libxml2'].libs.directories[0])) else: config_args.append('--with-included-libxml') diff --git a/var/spack/repos/builtin/packages/libxml2/package.py b/var/spack/repos/builtin/packages/libxml2/package.py index 10595f6352..781c4a9d3e 100644 --- a/var/spack/repos/builtin/packages/libxml2/package.py +++ b/var/spack/repos/builtin/packages/libxml2/package.py @@ -48,7 +48,7 @@ class Libxml2(AutotoolsPackage): def headers(self): include_dir = self.spec.prefix.include.libxml2 hl = find_all_headers(include_dir) - hl.directories = include_dir + hl.directories = [include_dir, self.spec.prefix.include] return hl def configure_args(self): |