diff options
| author | Jack Nagel | 2012-04-28 17:28:05 -0500 |
|---|---|---|
| committer | Jack Nagel | 2012-04-28 17:28:05 -0500 |
| commit | bffb19f55960c0bb3239a262505361ba40f75a86 (patch) | |
| tree | bfe336fce94e065959150006b9222622cd8e49e8 /Library/Formula | |
| parent | fb7b567b0623e53a249cc0fc3005a4cd24c29417 (diff) | |
| download | homebrew-bffb19f55960c0bb3239a262505361ba40f75a86.tar.bz2 | |
gmtl: move patch inline
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/gmtl.rb | 43 |
1 files changed, 42 insertions, 1 deletions
diff --git a/Library/Formula/gmtl.rb b/Library/Formula/gmtl.rb index c43a1ccfe..1449b654b 100644 --- a/Library/Formula/gmtl.rb +++ b/Library/Formula/gmtl.rb @@ -12,10 +12,51 @@ class Gmtl < Formula # https://sourceforge.net/tracker/?func=detail&aid=3172856&group_id=43735&atid=437247 # The SConstruct from gmtl's HEAD doesn't need to be patched def patches - "https://gist.github.com/raw/811405/fix-gmtl-build.diff" unless ARGV.build_head? + DATA unless ARGV.build_head? end def install system "scons", "install", "prefix=#{prefix}" end end + +__END__ +diff --git a/SConstruct b/SConstruct +index 8326a89..2eb7ff0 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -126,7 +126,9 @@ def BuildDarwinEnvironment(): + + exp = re.compile('^(.*)\/Python\.framework.*$') + m = exp.search(distutils.sysconfig.get_config_var('prefix')) +- framework_opt = '-F' + m.group(1) ++ framework_opt = None ++ if m: ++ framework_opt = '-F' + m.group(1) + + CXX = os.environ.get("CXX", WhereIs('g++')) + +@@ -138,7 +140,10 @@ def BuildDarwinEnvironment(): + + LINK = CXX + CXXFLAGS = ['-ftemplate-depth-256', '-DBOOST_PYTHON_DYNAMIC_LIB', +- '-Wall', framework_opt, '-pipe'] ++ '-Wall', '-pipe'] ++ ++ if framework_opt is not None: ++ CXXFLAGS.append(framework_opt) + + compiler_ver = match_obj.group(1) + compiler_major_ver = int(match_obj.group(2)) +@@ -152,7 +157,10 @@ def BuildDarwinEnvironment(): + CXXFLAGS += ['-Wno-long-double', '-no-cpp-precomp'] + + SHLIBSUFFIX = distutils.sysconfig.get_config_var('SO') +- SHLINKFLAGS = ['-bundle', framework_opt, '-framework', 'Python'] ++ SHLINKFLAGS = ['-bundle'] ++ ++ if framework_opt is not None: ++ SHLINKFLAGS.extend([framework_opt, '-framework', 'Python']) + LINKFLAGS = [] + + # Enable profiling? |
