aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorHarald Fernengel2013-07-14 19:08:28 +0200
committerMike McQuaid2013-07-14 13:23:50 -0700
commit5d36b005e9c97d8064eaf828edb0e7ccd8ea3588 (patch)
tree23fd6c2528a7a1519d5d0445df91440eaa8078fa /Library/Formula
parent188db909a077dbb579ac7fb59b75ca9366dbf08b (diff)
downloadhomebrew-5d36b005e9c97d8064eaf828edb0e7ccd8ea3588.tar.bz2
qt5: fix clash with installed qt.
Apparently, passing HOMEBREW_PREFIX as -I and -L makes the Qt5 configure script pick up Qt4 headers. Hotfix it until I find a solution that allows both installing to prefixes different than /usr/local and to prefixes that already contain Qt4. Closes #21211. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/qt5.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb
index 879b2acb7..2a225e6b7 100644
--- a/Library/Formula/qt5.rb
+++ b/Library/Formula/qt5.rb
@@ -34,7 +34,6 @@ class Qt5 < Formula
ENV.append 'CXXFLAGS', "-I#{MacOS.sdk_path}/System/Library/Frameworks/CoreFoundation.framework/Headers"
end
- args << "-I#{HOMEBREW_PREFIX}/include" << "-L#{HOMEBREW_PREFIX}/lib"
args << "-L#{MacOS::X11.prefix}/lib" << "-I#{MacOS::X11.prefix}/include" if MacOS::X11.installed?
args << "-plugin-sql-mysql" if build.with? 'mysql'