diff options
| author | Mike McQuaid | 2014-01-11 15:58:34 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2014-01-11 15:58:34 +0000 |
| commit | cd280eed3a09cd8d5d18c0c64510ac51e0e4a0b0 (patch) | |
| tree | 20dcbf9139d9d36ecb5157f61815477c3f756a6a /Library/Formula | |
| parent | 16e0b9192c7725cd2d12bb83dc821d43cb928de5 (diff) | |
| parent | 5b9142314b9c03e936a21afa3064eeade5a73c33 (diff) | |
| download | homebrew-cd280eed3a09cd8d5d18c0c64510ac51e0e4a0b0.tar.bz2 | |
Merge branch 'qt5'
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/qt5.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb index 1b4ff53c3..2c2c2a8ed 100644 --- a/Library/Formula/qt5.rb +++ b/Library/Formula/qt5.rb @@ -44,6 +44,12 @@ class Qt5 < Formula odie 'qt5: --with-demos-examples is no longer supported' if build.include? 'with-demos-examples' odie 'qt5: --with-debug-and-release is no longer supported' if build.include? 'with-debug-and-release' + def patches + # Fix QtScript linking against libstdc++ + # https://codereview.qt-project.org/#change,74777 + DATA if MacOS.version >= :mavericks + end + def install ENV.universal_binary if build.universal? args = ["-prefix", prefix, @@ -121,3 +127,18 @@ class Qt5 < Formula EOS end end + +__END__ +diff --git a/qtscript/src/script/script.pro b/qtscript/src/script/script.pro +index 8cb2f62..e48abac 100644 +--- a/qtscript/src/script/script.pro ++++ b/qtscript/src/script/script.pro +@@ -75,8 +75,4 @@ integrity { + CFLAGS += --diag_remark=236,82 + } + +-# WebKit doesn't compile in C++0x mode +-*-g++*:QMAKE_CXXFLAGS -= -std=c++0x -std=gnu++0x +-CONFIG -= c++11 +- + TR_EXCLUDE = $$WEBKITDIR/* |