From d84c59c9a069ec68c7cd1f6326e1ae8ee82a1eb7 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Wed, 2 Dec 2020 09:24:37 -0700 Subject: libtheora: patch autogen.sh to avoid (#20008) configure problem when spack runs the configure stage of its build/install pipeline Signed-off-by: Howard Pritchard --- .../exit-prior-to-running-configure.patch | 23 ++++++++++++++++++++++ .../repos/builtin/packages/libtheora/package.py | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 var/spack/repos/builtin/packages/libtheora/exit-prior-to-running-configure.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libtheora/exit-prior-to-running-configure.patch b/var/spack/repos/builtin/packages/libtheora/exit-prior-to-running-configure.patch new file mode 100644 index 0000000000..99992c39c2 --- /dev/null +++ b/var/spack/repos/builtin/packages/libtheora/exit-prior-to-running-configure.patch @@ -0,0 +1,23 @@ +From 0060fd48c12a59a080974ca3754bf0eab9ab6d35 Mon Sep 17 00:00:00 2001 +From: Howard Pritchard +Date: Tue, 24 Nov 2020 15:14:41 -0700 +Subject: [PATCH] exit prior to running configure + +Signed-off-by: Howard Pritchard + +diff --git a/autogen.sh b/autogen.sh +index bbca69dc..4de1e783 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -112,6 +112,8 @@ if test -z "$*"; then + echo "to pass any to it, please specify them on the $0 command line." + fi + ++exit 0 ++ + echo "Generating configuration files for $package, please wait...." + + echo " $ACLOCAL $ACLOCAL_FLAGS" +-- +2.18.2 + diff --git a/var/spack/repos/builtin/packages/libtheora/package.py b/var/spack/repos/builtin/packages/libtheora/package.py index 9a1b3554f3..874bc43f5b 100644 --- a/var/spack/repos/builtin/packages/libtheora/package.py +++ b/var/spack/repos/builtin/packages/libtheora/package.py @@ -22,6 +22,8 @@ class Libtheora(AutotoolsPackage): depends_on('doxygen', type='build') depends_on('libogg') + patch('exit-prior-to-running-configure.patch', when='@1.1.1') + def autoreconf(self, spec, prefix): sh = which('sh') if self.spec.satisfies('target=aarch64:'): -- cgit v1.2.3-60-g2f50