diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2018-03-14 09:01:11 +0100 |
|---|---|---|
| committer | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-03-14 09:01:11 +0100 |
| commit | 423f2341bce3837944b062e86f6a0505e7cfff41 (patch) | |
| tree | 8b67cdb82f207fe7d0f0af214f225bc2b2bf3415 | |
| parent | 1cde74656bd5d8c643b173c973d6647dd467e5e5 (diff) | |
| download | spack-423f2341bce3837944b062e86f6a0505e7cfff41.tar.gz spack-423f2341bce3837944b062e86f6a0505e7cfff41.tar.bz2 spack-423f2341bce3837944b062e86f6a0505e7cfff41.tar.xz spack-423f2341bce3837944b062e86f6a0505e7cfff41.zip | |
cube: Fix qt detection (#7242)
cube's configure only recognizes qt versions with single digit version
components and breaks with qt 5.10. Patch the configure files directly
to avoid having to regenerate them.
| -rw-r--r-- | var/spack/repos/builtin/packages/cube/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cube/qt-version.patch | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py index 4f1f643bf2..6c3b82d227 100644 --- a/var/spack/repos/builtin/packages/cube/package.py +++ b/var/spack/repos/builtin/packages/cube/package.py @@ -44,6 +44,8 @@ class Cube(AutotoolsPackage): variant('gui', default=False, description='Build CUBE GUI') + patch('qt-version.patch', when='@4.3.0:4.3.999 +gui') + depends_on('zlib') depends_on('qt@5:', when='@4.3.0:4.3.999 +gui') diff --git a/var/spack/repos/builtin/packages/cube/qt-version.patch b/var/spack/repos/builtin/packages/cube/qt-version.patch new file mode 100644 index 0000000000..33f36e76d2 --- /dev/null +++ b/var/spack/repos/builtin/packages/cube/qt-version.patch @@ -0,0 +1,24 @@ +diff -ruw cube-4.3.5.orig/build-backend/configure cube-4.3.5/build-backend/configure +--- cube-4.3.5.orig/build-backend/configure 2017-05-23 13:15:46.121704000 +0200 ++++ cube-4.3.5/build-backend/configure 2018-02-14 15:07:27.313842086 +0100 +@@ -5589,7 +5589,7 @@ + else + echo "$as_me:$LINENO: Running $QMAKE --version:" >&5 + $QMAKE --version >&5 2>&1 +- qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\.[0-9]\).in.*$/!d;s//\1/' ++ qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\+\.[0-9]\+\).in.*$/!d;s//\1/' + at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $at_cv_QT_VERSION" >&5 +diff -ruw cube-4.3.5.orig/build-frontend/configure cube-4.3.5/build-frontend/configure +--- cube-4.3.5.orig/build-frontend/configure 2017-05-23 13:16:00.499773000 +0200 ++++ cube-4.3.5/build-frontend/configure 2018-02-14 15:07:46.349487111 +0100 +@@ -19757,7 +19757,7 @@ + else + echo "$as_me:$LINENO: Running $QMAKE --version:" >&5 + $QMAKE --version >&5 2>&1 +- qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\.[0-9]\).in.*$/!d;s//\1/' ++ qmake_version_sed='/^.*Qt.version.\([0-9]\.[0-9]\+\.[0-9]\+\).in.*$/!d;s//\1/' + at_cv_QT_VERSION=`$QMAKE --version 2>&1 | sed "$qmake_version_sed"` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $at_cv_QT_VERSION" >&5 |