Add qt3 version support and a variant that controls patching the qt3 version for compile issues and answering yes to the license questions during build.
This commit is contained in:
parent
b4e0804b37
commit
15ec3cb3cd
@ -10,14 +10,23 @@ class Qt(Package):
|
||||
|
||||
version('5.4.0', 'e8654e4b37dd98039ba20da7a53877e6',
|
||||
url='http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.gz')
|
||||
|
||||
version('5.3.2', 'febb001129927a70174467ecb508a682',
|
||||
url='http://download.qt.io/archive/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz')
|
||||
|
||||
version('5.2.1', 'a78408c887c04c34ce615da690e0b4c8',
|
||||
url='http://download.qt.io/archive/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.gz')
|
||||
|
||||
version('4.8.6', '2edbe4d6c2eff33ef91732602f3518eb',
|
||||
url="http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz")
|
||||
|
||||
version('3.3.8b', '9f05b4125cfe477cc52c9742c3c09009',
|
||||
url="http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8b.tar.gz")
|
||||
|
||||
# Add patch for compile issues with qt3 found with use in the OpenSpeedShop project
|
||||
variant('krellpatch', default=False, description="build with openspeedshop based patch.")
|
||||
patch('qt3krell.patch', when='@3.3.8b+krellpatch')
|
||||
|
||||
# Use system openssl for security.
|
||||
#depends_on("openssl")
|
||||
|
||||
@ -25,7 +34,7 @@ class Qt(Package):
|
||||
depends_on("gtkplus")
|
||||
depends_on("libxml2")
|
||||
depends_on("zlib")
|
||||
depends_on("dbus")
|
||||
depends_on("dbus", when='@4:')
|
||||
depends_on("libtiff")
|
||||
depends_on("libpng")
|
||||
depends_on("libmng")
|
||||
@ -39,7 +48,7 @@ class Qt(Package):
|
||||
# depends_on("icu4c")
|
||||
|
||||
# OpenGL hardware acceleration
|
||||
depends_on("mesa")
|
||||
depends_on("mesa", when='@4:')
|
||||
depends_on("libxcb")
|
||||
|
||||
|
||||
@ -85,6 +94,15 @@ def common_config_args(self):
|
||||
# Don't disable all the database drivers, but should
|
||||
# really get them into spack at some point.
|
||||
|
||||
@when('@3')
|
||||
def configure(self):
|
||||
configure('-prefix', self.prefix,
|
||||
'-v',
|
||||
'-thread',
|
||||
'-shared',
|
||||
'-release',
|
||||
'-fast'
|
||||
)
|
||||
|
||||
@when('@4')
|
||||
def configure(self):
|
||||
|
68
var/spack/packages/qt/qt3krell.patch
Normal file
68
var/spack/packages/qt/qt3krell.patch
Normal file
@ -0,0 +1,68 @@
|
||||
--- qt-x11-free-3.3.8b/src/tools/qmap.h 2008-01-15 13:09:13.000000000 -0600
|
||||
+++ qt-x11-free-3.3.8b-fixes/src/tools/qmap.h 2015-07-08 15:47:34.757565247 -0500
|
||||
@@ -52,6 +52,7 @@
|
||||
#ifndef QT_NO_STL
|
||||
#include <iterator>
|
||||
#include <map>
|
||||
+#include <cstddef>
|
||||
#endif
|
||||
|
||||
//#define QT_CHECK_MAP_RANGE
|
||||
--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2008-01-15 13:09:13.000000000 -0600
|
||||
+++ qt-x11-free-3.3.8b-fixes/src/tools/qvaluelist.h 2015-07-08 15:47:34.758565247 -0500
|
||||
@@ -50,6 +50,7 @@
|
||||
#ifndef QT_NO_STL
|
||||
#include <iterator>
|
||||
#include <list>
|
||||
+#include <cstddef>
|
||||
#endif
|
||||
|
||||
//#define QT_CHECK_VALUELIST_RANGE
|
||||
--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2008-01-15 13:09:13.000000000 -0600
|
||||
+++ qt-x11-free-3.3.8b-fixes/src/tools/qvaluevector.h 2015-07-08 15:47:34.758565247 -0500
|
||||
@@ -47,6 +47,7 @@
|
||||
|
||||
#ifndef QT_NO_STL
|
||||
#include <vector>
|
||||
+#include <cstddef>
|
||||
#endif
|
||||
|
||||
template <class T>
|
||||
--- qt-x11-free-3.3.8b/configure 2008-01-15 13:09:15.000000000 -0600
|
||||
+++ qt-x11-free-3.3.8b-fixes/configure 2015-07-08 15:49:03.379560633 -0500
|
||||
@@ -2339,7 +2339,7 @@
|
||||
else
|
||||
echo "Do you accept the terms of the $TheLicense? \c"
|
||||
fi
|
||||
- read acceptance
|
||||
+ acceptance=yes
|
||||
echo
|
||||
if [ "$acceptance" = yes ]; then
|
||||
break
|
||||
@@ -2397,7 +2397,7 @@
|
||||
else
|
||||
echo "Do you accept the terms of $affix license? \c"
|
||||
fi
|
||||
- read acceptance
|
||||
+ acceptance=yes
|
||||
echo
|
||||
if [ "$acceptance" = "yes" ]; then
|
||||
break
|
||||
@@ -2443,7 +2443,7 @@
|
||||
else
|
||||
echo "Do you accept the terms of the license? \c"
|
||||
fi
|
||||
- read acceptance
|
||||
+ acceptance=yes
|
||||
echo
|
||||
if [ "$acceptance" = "yes" ]; then
|
||||
break
|
||||
@@ -2524,7 +2524,7 @@
|
||||
else
|
||||
echo "Do you accept the terms of the $Platform License? \c"
|
||||
fi
|
||||
- read acceptance
|
||||
+ acceptance=yes
|
||||
echo
|
||||
if [ "$acceptance" = "yes" ]; then
|
||||
break
|
Loading…
Reference in New Issue
Block a user