diff options
| author | Misty De Meo | 2014-11-14 10:09:56 -0800 |
|---|---|---|
| committer | Misty De Meo | 2014-11-14 12:19:01 -0800 |
| commit | 6f24b31a393e455124385faf40c813a02233692d (patch) | |
| tree | 778184099e575c127f2d60a4fc75a8dba68756f9 /Library/Formula | |
| parent | 4dc3a664d8379b3a012e9e773f1e8d5cf8077cc2 (diff) | |
| download | homebrew-6f24b31a393e455124385faf40c813a02233692d.tar.bz2 | |
chuck: fix OS X version detection regex for 10.10
Fixes #34189.
Closes #34192.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/chuck.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Library/Formula/chuck.rb b/Library/Formula/chuck.rb index f2de6ee34..7acfb84b4 100644 --- a/Library/Formula/chuck.rb +++ b/Library/Formula/chuck.rb @@ -7,6 +7,7 @@ class Chuck < Formula # Homebrew already takes care of setting the sysroot; # also lets the build work on CLT. + # Also fixes the version regex for 10.10+; reported to chuck-dev. patch :DATA def install @@ -18,15 +19,17 @@ end __END__ diff --git a/src/makefile.osx b/src/makefile.osx -index 4531ee1..cd4a910 100644 +index 4531ee1..65cee97 100644 --- a/src/makefile.osx +++ b/src/makefile.osx -@@ -2,8 +2,6 @@ +@@ -1,9 +1,7 @@ + # uncomment the following to force 32-bit compilation # FORCE_M32=-m32 - ifneq ($(shell sw_vers -productVersion | egrep '10\.[6789](\.[0-9]+)?'),) +-ifneq ($(shell sw_vers -productVersion | egrep '10\.[6789](\.[0-9]+)?'),) -SDK=$(shell xcodebuild -sdk macosx -version | grep '^Path:' | sed 's/Path: \(.*\)/\1/') -ISYSROOT=-isysroot $(SDK) ++ifneq ($(shell sw_vers -productVersion | egrep '10\.([6789]|1[0-9]+)(\.[0-9]+)?'),) LINK_EXTRAS=-F/System/Library/PrivateFrameworks \ -weak_framework MultitouchSupport else |