From ac039239e0702ce56b1e77377d21a97fdde85508 Mon Sep 17 00:00:00 2001
From: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
Date: Tue, 29 Mar 2016 16:26:08 -0400
Subject: [PATCH] OSX : force qt55 version
This patch forces the installation of the qt55 version.
The 5.6+ version makes the compilation fail. See the Tuleap bug for
further information.
Change-Id: I937dcc47ed93156cb4c6fa71ce043a493f6e66a2
Tuleap: #511
---
make-ring.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/make-ring.py b/make-ring.py
index 673cd9ad..3d4c4e12 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -78,7 +78,7 @@ DEBIAN_DEPENDENCIES = [
]
OSX_DEPENDENCIES = [
- 'autoconf', 'cmake', 'gettext', 'pkg-config', 'qt5',
+ 'autoconf', 'cmake', 'gettext', 'pkg-config', 'homebrew/versions/qt55',
'libtool', 'yasm', 'automake'
]
@@ -139,7 +139,7 @@ def run_install(args):
if args.global_install:
install_args += ' -g'
if args.distribution == "OSX":
- proc= subprocess.Popen("brew --prefix qt5", shell=True, stdout=subprocess.PIPE)
+ proc= subprocess.Popen("brew --prefix homebrew/versions/qt55", shell=True, stdout=subprocess.PIPE)
qt5dir = proc.stdout.read()
os.environ['CMAKE_PREFIX_PATH'] = str(qt5dir.decode('ascii'))
install_args += " -c client-macosx"
--
GitLab