diff options
| author | Max Howell | 2012-09-13 12:10:01 -0400 |
|---|---|---|
| committer | Max Howell | 2012-09-13 12:13:36 -0400 |
| commit | 07f460b0583495771789700aebc2a3fba0a10cbc (patch) | |
| tree | 905b966e03fb86c4810db1657e8675e3c1a7ba72 /Library | |
| parent | 23f7a06a77edfce1860ae9299175cb9e339423b6 (diff) | |
| download | homebrew-07f460b0583495771789700aebc2a3fba0a10cbc.tar.bz2 | |
Don't add GL paths to superenv if depends_on X
Fixes #14780.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/gpac.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/superenv.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Library/Formula/gpac.rb b/Library/Formula/gpac.rb index f7862afb2..d3f5404a9 100644 --- a/Library/Formula/gpac.rb +++ b/Library/Formula/gpac.rb @@ -41,7 +41,7 @@ class Gpac < Formula # Force detection of X libs on 64-bit kernel "--extra-ldflags=-L#{MacOS::X11.lib}"] - system "chmod +x configure" + chmod 0700, "configure" system "./configure", *args system "make" system "make install" diff --git a/Library/Homebrew/superenv.rb b/Library/Homebrew/superenv.rb index bdc271c3e..681022c4a 100644 --- a/Library/Homebrew/superenv.rb +++ b/Library/Homebrew/superenv.rb @@ -140,7 +140,7 @@ class << ENV # TODO prolly shouldn't always do this? paths << "#{sdk}/System/Library/Frameworks/Python.framework/Versions/Current/include/python2.7" end - paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" + paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Headers/" unless x11? paths << "#{MacSystem.x11_prefix}/include" if x11? paths.to_path_s end @@ -149,7 +149,7 @@ class << ENV sdk = MacOS.sdk_path if MacSystem.xcode43_without_clt? paths = [] # things expect to find GL headers since X11 used to be a default, so we add them - paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" + paths << "#{sdk}/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries" unless x11? paths << "#{MacSystem.x11_prefix}/lib" if x11? paths.to_path_s end |