From 4b471ecc6e9b48e2083194d88023d9638fdf5f2d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 3 Mar 2016 10:10:26 -0500 Subject: qt: support detecting newer SDK paths --- var/spack/repos/builtin/packages/qt/package.py | 2 ++ .../repos/builtin/packages/qt/qt4-corewlan-new-osx.patch | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch 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 \ -- cgit v1.2.3-60-g2f50 From 5ba1144515985889c72eb87fff9e98ec02fb865e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:41:16 -0400 Subject: qt: create a dbus variant --- var/spack/repos/builtin/packages/qt/package.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 1a664e1287..8136208184 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -47,6 +47,7 @@ class Qt(Package): variant('krellpatch', default=False, description="Build with openspeedshop based patch.") variant('mesa', default=False, description="Depend on mesa.") variant('gtk', default=False, description="Build with gtkplus.") + variant('dbus', default=False, description="Build with D-Bus support.") patch('qt3krell.patch', when='@3.3.8b+krellpatch') @@ -61,7 +62,7 @@ class Qt(Package): depends_on("gtkplus", when='+gtk') depends_on("libxml2") depends_on("zlib") - depends_on("dbus", when='@4:') + depends_on("dbus", when='@4:+dbus') depends_on("libtiff") depends_on("libpng@1.2.56", when='@3') depends_on("libpng", when='@4:') @@ -145,7 +146,7 @@ class Qt(Package): @property def common_config_args(self): - return [ + config_args = [ '-prefix', self.prefix, '-v', '-opensource', @@ -154,7 +155,6 @@ class Qt(Package): '-shared', '-confirm-license', '-openssl-linked', - '-dbus-linked', '-optimized-qmake', '-no-openvg', '-no-pch', @@ -162,6 +162,13 @@ class Qt(Package): '-no-nis' ] + if '+dbus' in self.spec: + config_args.append('-dbus-linked') + else: + config_args.append('-no-dbus') + + return config_args + # Don't disable all the database drivers, but should # really get them into spack at some point. -- cgit v1.2.3-60-g2f50 From 4c566617f791e3081c8ed869af352323bcc145c7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:41:35 -0400 Subject: qt: make libxcb a conditional dependency OS X doesn't have X (usually). --- var/spack/repos/builtin/packages/qt/package.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 8136208184..d17aacd1d3 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -24,6 +24,7 @@ ############################################################################## from spack import * import os +import sys class Qt(Package): @@ -78,7 +79,7 @@ class Qt(Package): # OpenGL hardware acceleration depends_on("mesa", when='@4:+mesa') - depends_on("libxcb") + depends_on("libxcb", when=sys.platform != 'darwin') def url_for_version(self, version): # URL keeps getting more complicated with every release -- cgit v1.2.3-60-g2f50 From a9bfd88248683a0791a009aeed6ef5d72b0a642c Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:41:59 -0400 Subject: qt: depend on OpenSSL OS X doesn't come with an OpenSSL supported by Qt4. --- var/spack/repos/builtin/packages/qt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index d17aacd1d3..4207b3527f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -58,7 +58,7 @@ class Qt(Package): patch('qt4-corewlan-new-osx.patch', when='@4') # Use system openssl for security. - # depends_on("openssl") + depends_on("openssl") depends_on("gtkplus", when='+gtk') depends_on("libxml2") -- cgit v1.2.3-60-g2f50 From 6075abfbdb25001615d5e2e256df5fb9f5ef9906 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:42:27 -0400 Subject: qt: depend on icu4c --- var/spack/repos/builtin/packages/qt/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 4207b3527f..e9cab85e81 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -75,7 +75,7 @@ class Qt(Package): # depends_on("flex", type='build') # depends_on("bison", type='build') # depends_on("ruby", type='build') - # depends_on("icu4c") + depends_on("icu4c") # OpenGL hardware acceleration depends_on("mesa", when='@4:+mesa') -- cgit v1.2.3-60-g2f50 From aa9faceb0332e63c2dd83d90887e03ad6c2eb837 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:42:40 -0400 Subject: qt: disable phonon support --- var/spack/repos/builtin/packages/qt/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index e9cab85e81..80efc83c5a 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -156,6 +156,7 @@ class Qt(Package): '-shared', '-confirm-license', '-openssl-linked', + '-no-phonon', '-optimized-qmake', '-no-openvg', '-no-pch', -- cgit v1.2.3-60-g2f50 From 71c357e485cf1d1bd7dc24a7da3b3ad042ca2ee1 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 11:58:52 -0400 Subject: qt: support building with 10.10+ SDKs --- var/spack/repos/builtin/packages/qt/package.py | 1 + .../repos/builtin/packages/qt/qt4-el-capitan.patch | 31 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 80efc83c5a..3f62c5c77f 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -56,6 +56,7 @@ class Qt(Package): patch('btn_trigger_happy.patch', when='@5.7.0:') patch('qt4-corewlan-new-osx.patch', when='@4') + patch('qt4-el-capitan.patch', when='@4') # Use system openssl for security. depends_on("openssl") diff --git a/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch b/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch new file mode 100644 index 0000000000..35f154d3b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt4-el-capitan.patch @@ -0,0 +1,31 @@ +From 27aa46933bb32a88c310fe5918a49a3f34d65dfe Mon Sep 17 00:00:00 2001 +From: Mike McQuaid +Date: Sun, 13 Sep 2015 11:55:59 +0100 +Subject: [PATCH] Fix El Capitan build. + +--- + src/gui/painting/qpaintengine_mac.cpp | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp +index 4aa0668..63b646d 100644 +--- a/src/gui/painting/qpaintengine_mac.cpp ++++ b/src/gui/painting/qpaintengine_mac.cpp +@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi + } + + // Get the color space from the display profile. +- CGColorSpaceRef colorSpace = 0; +- CMProfileRef displayProfile = 0; +- CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile); +- if (err == noErr) { +- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile); +- CMCloseProfile(displayProfile); +- } ++ CGColorSpaceRef colorSpace = CGDisplayCopyColorSpace(displayID); + + // Fallback: use generic DeviceRGB + if (colorSpace == 0) +-- +2.3.8 (Apple Git-58) + -- cgit v1.2.3-60-g2f50 From 3df1eeccb9b6e4c302db825b2fe6338462740fe8 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:53:21 -0400 Subject: qt: setup the sdk and platform arguments --- var/spack/repos/builtin/packages/qt/package.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3f62c5c77f..8c918e4c0b 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -170,6 +170,24 @@ class Qt(Package): else: config_args.append('-no-dbus') + if sys.platform == 'darwin': + sdkpath = which('xcrun')('--show-sdk-path', output=str) + config_args.extend([ + '-sdk', sdkpath.strip(), + ]) + use_clang_platform = False + if self.spec.compiler.name == 'clang' and \ + str(self.spec.compiler.version).endwith('-apple'): + use_clang_platform = True + # No one uses gcc-4.2.1 anymore; this is clang. + if self.spec.compiler.name == 'gcc' and \ + str(self.spec.compiler.version) == '4.2.1': + use_clang_platform = True + if use_clang_platform: + config_args.extend([ + '-platform', 'unsupported/macx-clang', + ]) + return config_args # Don't disable all the database drivers, but should @@ -190,7 +208,12 @@ class Qt(Package): def configure(self): configure('-fast', '-no-webkit', +<<<<<<< HEAD '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), +||||||| parent of e72b834... qt: setup the sdk and platform arguments +======= + '-arch', str(self.spec.architecture.target), +>>>>>>> e72b834... qt: setup the sdk and platform arguments *self.common_config_args) @when('@5.0:5.6') -- cgit v1.2.3-60-g2f50 From b810a113af9ce32b7e83d122187878cf1b014631 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 10:58:16 -0400 Subject: pixman: disable mmx --- var/spack/repos/builtin/packages/pixman/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/var/spack/repos/builtin/packages/pixman/package.py b/var/spack/repos/builtin/packages/pixman/package.py index 39041587f5..41aad0c90a 100644 --- a/var/spack/repos/builtin/packages/pixman/package.py +++ b/var/spack/repos/builtin/packages/pixman/package.py @@ -39,6 +39,7 @@ class Pixman(Package): def install(self, spec, prefix): configure("--prefix=%s" % prefix, + "--disable-mmx", "--disable-gtk") make() make("install") -- cgit v1.2.3-60-g2f50 From a05a6456d5aa69fdc369b99134227a4958b9832e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 11:00:58 -0400 Subject: glib: build on macos --- .../packages/glib/no-Werror=format-security.patch | 16 ++++++++++++++++ var/spack/repos/builtin/packages/glib/package.py | 19 ++++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 var/spack/repos/builtin/packages/glib/no-Werror=format-security.patch diff --git a/var/spack/repos/builtin/packages/glib/no-Werror=format-security.patch b/var/spack/repos/builtin/packages/glib/no-Werror=format-security.patch new file mode 100644 index 0000000000..cfcfe424be --- /dev/null +++ b/var/spack/repos/builtin/packages/glib/no-Werror=format-security.patch @@ -0,0 +1,16 @@ +--- a/configure.ac 2016-08-16 11:57:34.000000000 -0400 ++++ b/configure.ac 2016-08-16 11:57:36.000000000 -0400 +@@ -3357,11 +3357,11 @@ + enable_compile_warnings=yes) + AS_IF([test "x$enable_compile_warnings" = xyes], [ + CC_CHECK_FLAGS_APPEND([GLIB_WARN_CFLAGS], [CFLAGS], [\ + -Wall -Wstrict-prototypes -Werror=declaration-after-statement \ + -Werror=missing-prototypes -Werror=implicit-function-declaration \ +- -Werror=pointer-arith -Werror=init-self -Werror=format-security \ +- -Werror=format=2 -Werror=missing-include-dirs]) ++ -Werror=pointer-arith -Werror=init-self \ ++ -Werror=missing-include-dirs]) + ]) + AC_SUBST(GLIB_WARN_CFLAGS) + + # diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 94ef95e7ab..3e687ccd95 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import os class Glib(Package): @@ -38,14 +39,20 @@ class Glib(Package): version('2.48.1', '67bd3b75c9f6d5587b457dc01cdcd5bb') version('2.42.1', '89c4119e50e767d3532158605ee9121a') + depends_on('autoconf', type='build') + depends_on('automake', type='build') + depends_on('libtool', type='build') + depends_on('pkg-config', type='build') depends_on('libffi') depends_on('zlib') - depends_on('pkg-config', type='build') depends_on('gettext') depends_on('pcre+utf', when='@2.48:') # The following patch is needed for gcc-6.1 patch('g_date_strftime.patch', when='@2.42.1') + # Clang doesn't seem to acknowledge the pragma lines to disable the -Werror + # around a legitimate usage. + patch('no-Werror=format-security.patch') def url_for_version(self, version): """Handle glib's version-based custom URLs.""" @@ -53,6 +60,16 @@ class Glib(Package): return url + '/%s/glib-%s.tar.xz' % (version.up_to(2), version) def install(self, spec, prefix): + autoreconf = which("autoreconf") + autoreconf("--install", "--verbose", "--force", + "-I", "config", + "-I", os.path.join(spec['pkg-config'].prefix, + "share", "aclocal"), + "-I", os.path.join(spec['automake'].prefix, + "share", "aclocal"), + "-I", os.path.join(spec['libtool'].prefix, + "share", "aclocal"), + ) configure("--prefix=%s" % prefix) make() make("install", parallel=False) -- cgit v1.2.3-60-g2f50 From 4687860885fc06ba8d911e99408b6a9f4221c64e Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 25 Aug 2016 15:57:29 -0400 Subject: qt: force the 10.9 SDK on macos The 10.11 SDK fails to configure. --- var/spack/repos/builtin/packages/qt/package.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 8c918e4c0b..78bc4bed9c 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -171,7 +171,10 @@ class Qt(Package): config_args.append('-no-dbus') if sys.platform == 'darwin': - sdkpath = which('xcrun')('--show-sdk-path', output=str) + sdkpath = which('xcrun')('--show-sdk-path', + # XXX(macos): the 10.11 SDK fails to configure. + '--sdk', 'macosx10.9', + output=str) config_args.extend([ '-sdk', sdkpath.strip(), ]) @@ -208,12 +211,8 @@ class Qt(Package): def configure(self): configure('-fast', '-no-webkit', -<<<<<<< HEAD '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), -||||||| parent of e72b834... qt: setup the sdk and platform arguments -======= '-arch', str(self.spec.architecture.target), ->>>>>>> e72b834... qt: setup the sdk and platform arguments *self.common_config_args) @when('@5.0:5.6') -- cgit v1.2.3-60-g2f50 From 67462ca65a00a718e7713ecd6257de5309de4a14 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 29 Aug 2016 15:41:53 -0400 Subject: qt: fix pcre header conflict in javascriptcore --- var/spack/repos/builtin/packages/qt/package.py | 1 + .../builtin/packages/qt/qt4-pcre-include-conflict.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 78bc4bed9c..25c896074b 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -56,6 +56,7 @@ class Qt(Package): patch('btn_trigger_happy.patch', when='@5.7.0:') patch('qt4-corewlan-new-osx.patch', when='@4') + patch('qt4-pcre-include-conflict.patch', when='@4') patch('qt4-el-capitan.patch', when='@4') # Use system openssl for security. diff --git a/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch b/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch new file mode 100644 index 0000000000..854e564bfb --- /dev/null +++ b/var/spack/repos/builtin/packages/qt/qt4-pcre-include-conflict.patch @@ -0,0 +1,16 @@ +diff -U5 -Nru qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h qt-everywhere-opensource-src-4.8.6.pcre/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h +--- qt-everywhere-opensource-src-4.8.6/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2014-04-10 14:37:12.000000000 -0400 ++++ qt-everywhere-opensource-src-4.8.6.pcre/src/3rdparty/javascriptcore/JavaScriptCore/yarr/RegexJIT.h 2016-08-29 15:30:02.216546252 -0400 +@@ -32,11 +32,11 @@ + + #include "MacroAssembler.h" + #include "RegexPattern.h" + #include + +-#include ++#include + struct JSRegExp; // temporary, remove when fallback is removed. + + #if CPU(X86) && !COMPILER(MSVC) + #define YARR_CALL __attribute__ ((regparm (3))) + #else -- cgit v1.2.3-60-g2f50 From fca26c0b7916142471a2dda53ac1448a912eedda Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 29 Aug 2016 17:26:22 -0400 Subject: qt: make -no-phonon specific to qt4 --- var/spack/repos/builtin/packages/qt/package.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 25c896074b..5fdd07c7a5 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -158,7 +158,6 @@ class Qt(Package): '-shared', '-confirm-license', '-openssl-linked', - '-no-phonon', '-optimized-qmake', '-no-openvg', '-no-pch', @@ -166,6 +165,9 @@ class Qt(Package): '-no-nis' ] + if '@4' in self.spec: + config_args.append('-no-phonon') + if '+dbus' in self.spec: config_args.append('-dbus-linked') else: -- cgit v1.2.3-60-g2f50 From 112122bc28bea05e960691f4ee87acd53d15d509 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 30 Aug 2016 10:52:11 -0400 Subject: qt: progress on qt5.5 on osx Qt5.5 searches for the SDK itself and just ignores environment variables like CC and CXX, skipping the spack wrappers. --- var/spack/repos/builtin/packages/qt/package.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 5fdd07c7a5..3217b90215 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -173,7 +173,16 @@ class Qt(Package): else: config_args.append('-no-dbus') - if sys.platform == 'darwin': + if '@5:' in self.spec and sys.platform == 'darwin': + config_args.extend([ + '-no-xinput2', + '-no-xcb-xlib', + '-no-pulseaudio', + '-no-alsa', + '-no-gtkstyle', + ]) + + if '@4' in self.spec and sys.platform == 'darwin': sdkpath = which('xcrun')('--show-sdk-path', # XXX(macos): the 10.11 SDK fails to configure. '--sdk', 'macosx10.9', @@ -222,7 +231,6 @@ class Qt(Package): def configure(self): configure('-no-eglfs', '-no-directfb', - '-qt-xcb', '{0}-gtkstyle'.format('' if '+gtk' in self.spec else '-no'), '-skip', 'qtwebkit', *self.common_config_args) -- cgit v1.2.3-60-g2f50 From 77611913c68bda147ec778215518abd5a09241e2 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 6 Sep 2016 16:02:25 -0400 Subject: qt: only pass -qt-xcb on non-OS X --- var/spack/repos/builtin/packages/qt/package.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 3217b90215..3032e81f78 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -237,12 +237,18 @@ class Qt(Package): @when('@5.7:') def configure(self): + args = self.common_config_args + + if not sys.platform == 'darwin': + args.extend([ + '-qt-xcb', + ]) + configure('-no-eglfs', '-no-directfb', - '-qt-xcb', '{0}-gtk'.format('' if '+gtk' in self.spec else '-no'), '-skip', 'webengine', - *self.common_config_args) + *args) def install(self, spec, prefix): self.configure() -- cgit v1.2.3-60-g2f50