diff --git a/make-ring.py b/make-ring.py index 8663a5784e7096e2679abbcf203a5061dd760b9f..e1212669f5ab1e5b3fa51a4186539d39cde8ff55 100755 --- a/make-ring.py +++ b/make-ring.py @@ -37,10 +37,14 @@ APT_INSTALL_SCRIPT = [ 'apt-get install -y %(packages)s --ignore-missing' ] +BREW_UNLINK_SCRIPT = [ + 'brew unlink %(packages)s' +] + BREW_INSTALL_SCRIPT = [ 'brew update', 'brew install -y %(packages)s', - 'brew link --force gettext' + 'brew link --force --overwrite %(packages)s' ] RPM_INSTALL_SCRIPT = [ @@ -142,10 +146,15 @@ ARCH_LINUX_DEPENDENCIES = [ ] OSX_DEPENDENCIES = [ - 'autoconf', 'autoconf-archive', 'cmake', 'gettext', 'pkg-config', 'homebrew/versions/qt55', + 'autoconf', 'cmake', 'gettext', 'pkg-config', 'qt5', 'libtool', 'yasm', 'automake' ] +OSX_DEPENDENCIES_UNLINK = [ + 'autoconf*', 'cmake*', 'gettext*', 'pkg-config*', 'qt*', 'qt@5.*', + 'libtool*', 'yasm*', 'automake*' +] + UNINSTALL_SCRIPT = [ 'make -C daemon uninstall', 'xargs rm < lrc/build-global/install_manifest.txt', @@ -203,6 +212,10 @@ def run_dependencies(args): ) elif args.distribution == "OSX": + execute_script( + BREW_UNLINK_SCRIPT, + {"packages": ' '.join(OSX_DEPENDENCIES_UNLINK)} + ) execute_script( BREW_INSTALL_SCRIPT, {"packages": ' '.join(OSX_DEPENDENCIES)} @@ -240,7 +253,7 @@ def run_install(args): if args.global_install: install_args += ' -g' if args.distribution == "OSX": - proc= subprocess.Popen("brew --prefix homebrew/versions/qt55", shell=True, stdout=subprocess.PIPE) + proc= subprocess.Popen("brew --prefix qt5", shell=True, stdout=subprocess.PIPE) qt5dir = proc.stdout.read() os.environ['CMAKE_PREFIX_PATH'] = str(qt5dir.decode('ascii')) install_args += " -c client-macosx"