summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2016-03-03 10:10:26 -0500
committerBen Boeckel <ben.boeckel@kitware.com>2016-09-06 15:59:46 -0400
commit4b471ecc6e9b48e2083194d88023d9638fdf5f2d (patch)
tree6f0f314c3462e06712b348e72271f8656b4392d4
parentf34dd94166ecf92b981908153a02bd583bdff164 (diff)
downloadspack-4b471ecc6e9b48e2083194d88023d9638fdf5f2d.tar.gz
spack-4b471ecc6e9b48e2083194d88023d9638fdf5f2d.tar.bz2
spack-4b471ecc6e9b48e2083194d88023d9638fdf5f2d.tar.xz
spack-4b471ecc6e9b48e2083194d88023d9638fdf5f2d.zip
qt: support detecting newer SDK paths
-rw-r--r--var/spack/repos/builtin/packages/qt/package.py2
-rw-r--r--var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch16
2 files changed, 18 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py
index 436702fa4e..1a664e1287 100644
--- a/var/spack/repos/builtin/packages/qt/package.py
+++ b/var/spack/repos/builtin/packages/qt/package.py
@@ -53,6 +53,8 @@ class Qt(Package):
# https://github.com/xboxdrv/xboxdrv/issues/188
patch('btn_trigger_happy.patch', when='@5.7.0:')
+ patch('qt4-corewlan-new-osx.patch', when='@4')
+
# Use system openssl for security.
# depends_on("openssl")
diff --git a/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch
new file mode 100644
index 0000000000..370edf7fa5
--- /dev/null
+++ b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch
@@ -0,0 +1,16 @@
+diff -Nr -U5 qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro
+--- qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro 2014-04-10 14:37:12.000000000 -0400
++++ qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro 2015-12-02 12:21:34.608585392 -0500
+@@ -3,11 +3,11 @@
+
+ QT = core network
+ LIBS += -framework Foundation -framework SystemConfiguration
+
+ contains(QT_CONFIG, corewlan) {
+- isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") {
++ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, ".*MacOSX10\.([6789]|1[01])\.sdk") {
+ LIBS += -framework CoreWLAN -framework Security
+ }
+ }
+
+ HEADERS += qcorewlanengine.h \