diff options
| author | Nikolaus Demmel | 2014-04-08 16:32:07 +0200 |
|---|---|---|
| committer | Mike McQuaid | 2014-04-16 09:36:23 +0100 |
| commit | 6739a656cfdbc7e16066e7887758127422a6a124 (patch) | |
| tree | 400c5ec81fc2706e16bc33cb35b6e1a099d15812 /Library/Formula | |
| parent | 433ecceec019c199d3ff07765d97f93b8441bb65 (diff) | |
| download | homebrew-6739a656cfdbc7e16066e7887758127422a6a124.tar.bz2 | |
qt5: Remove the saved superenv pkg-config setup.
- Qt saves the pkg-config setup from compile time (PKG_CONFIG_LIBDIR). Remove
this after in `install`. This way pkg-config called from with qmake will be
controlled by the user's setup.
- Adresses second half of https://github.com/Homebrew/homebrew/issues/27184
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/qt5.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Library/Formula/qt5.rb b/Library/Formula/qt5.rb index e5634c27f..bc8a5cbeb 100644 --- a/Library/Formula/qt5.rb +++ b/Library/Formula/qt5.rb @@ -104,6 +104,11 @@ class Qt5 < Formula include.install_symlink path => path.parent.basename(".framework") end + # configure saved the PKG_CONFIG_LIBDIR set up by superenv; remove it + # see: https://github.com/Homebrew/homebrew/issues/27184 + inreplace prefix/"mkspecs/qconfig.pri", /\n\n# pkgconfig/, "" + inreplace prefix/"mkspecs/qconfig.pri", /\nPKG_CONFIG_.*=.*$/, "" + Pathname.glob("#{bin}/*.app") { |app| mv app, prefix } end |