diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2021-06-09 19:10:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 17:10:13 -0600 |
| commit | 849943c63d1948c65f75cb8164e96ed361ca7a7f (patch) | |
| tree | 63cfc2dd3f1c79d14b62841745423f69c3634b3f | |
| parent | 47ef59c8855f05a437e238f379b34143b98be1c0 (diff) | |
| download | spack-849943c63d1948c65f75cb8164e96ed361ca7a7f.tar.gz spack-849943c63d1948c65f75cb8164e96ed361ca7a7f.tar.bz2 spack-849943c63d1948c65f75cb8164e96ed361ca7a7f.tar.xz spack-849943c63d1948c65f75cb8164e96ed361ca7a7f.zip | |
cairo: circumvent missing gtkdocize for autoconf 2.70+ (#23971)
| -rw-r--r-- | var/spack/repos/builtin/packages/cairo/disable-gtk-docs.patch | 17 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cairo/package.py | 9 |
2 files changed, 22 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/cairo/disable-gtk-docs.patch b/var/spack/repos/builtin/packages/cairo/disable-gtk-docs.patch new file mode 100644 index 0000000000..eef7a44f1b --- /dev/null +++ b/var/spack/repos/builtin/packages/cairo/disable-gtk-docs.patch @@ -0,0 +1,17 @@ +--- autogen.orig.sh 2021-06-08 19:55:17.000000000 -0400 ++++ autogen.sh 2021-06-08 19:58:29.000000000 -0400 +@@ -13,13 +13,7 @@ + exit 1 + fi + +-GTKDOCIZE=`which gtkdocize` +-if test -z $GTKDOCIZE; then +- echo "*** No GTK-Doc found, documentation won't be generated ***" +-else +- gtkdocize || exit $? +-fi +- ++GTKDOCIZE=echo + # create dummy */Makefile.am.features and ChangeLog to make automake happy + > boilerplate/Makefile.am.features + > src/Makefile.am.features diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py index eefd277572..df9f1d7e2f 100644 --- a/var/spack/repos/builtin/packages/cairo/package.py +++ b/var/spack/repos/builtin/packages/cairo/package.py @@ -51,12 +51,13 @@ class Cairo(AutotoolsPackage): # patch from https://gitlab.freedesktop.org/cairo/cairo/issues/346 patch('fontconfig.patch', when='@1.16.0:1.17.2') - - def setup_build_environment(self, env): - env.set('NOCONFIGURE', "1") + # Don't regenerate docs to avoid a dependency on gtk-doc + patch('disable-gtk-docs.patch', when='^autoconf@2.70:') def autoreconf(self, spec, prefix): - which('sh')('./autogen.sh') + # Regenerate, directing the script *not* to call configure before Spack + # does + which('sh')('./autogen.sh', extra_env={'NOCONFIGURE': '1'}) def configure_args(self): args = [ |