diff options
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/afsctool.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/appswitch.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/bcrypt.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/dcraw.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/dos2unix.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/foremost.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/launch.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/lockrun.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/lua.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/net-nuclear.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/pwnat.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/shapefile.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/simh.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/sleepwatcher.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/tree.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/unix2dos.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/unyaffs.rb | 7 |
17 files changed, 18 insertions, 21 deletions
diff --git a/Library/Formula/afsctool.rb b/Library/Formula/afsctool.rb index 6d23c5744..d2acd095e 100644 --- a/Library/Formula/afsctool.rb +++ b/Library/Formula/afsctool.rb @@ -9,7 +9,7 @@ class Afsctool <Formula def install ENV.fast Dir.chdir "afsctool_34" do - system "#{ENV['CC']} #{ENV['CFLAGS']} -lz -framework CoreServices -o afsctool afsctool.c" + system "#{ENV.cc} #{ENV.cflags} -lz -framework CoreServices -o afsctool afsctool.c" bin.install 'afsctool' end end diff --git a/Library/Formula/appswitch.rb b/Library/Formula/appswitch.rb index df2eef95f..8e31f79fd 100644 --- a/Library/Formula/appswitch.rb +++ b/Library/Formula/appswitch.rb @@ -6,7 +6,7 @@ class Appswitch <Formula md5 '07cf9884a07939da487898cddba0c296' def install - system "#{ENV.cc} -o appswitch #{ENV['CFLAGS']} main.c -framework ApplicationServices" + system "#{ENV.cc} -o appswitch #{ENV.cflags} main.c -framework ApplicationServices" man1.install gzip('appswitch.1') bin.install 'appswitch' end diff --git a/Library/Formula/bcrypt.rb b/Library/Formula/bcrypt.rb index 9dec190d2..7d2b3090e 100644 --- a/Library/Formula/bcrypt.rb +++ b/Library/Formula/bcrypt.rb @@ -8,7 +8,7 @@ class Bcrypt <Formula def install inreplace "Makefile" do |s| s.change_make_var! "CC", ENV.cc - s.change_make_var! "CFLAGS", ENV['CFLAGS'] + s.change_make_var! "CFLAGS", ENV.cflags s.change_make_var! "LDFLAGS", "-lz" end diff --git a/Library/Formula/dcraw.rb b/Library/Formula/dcraw.rb index 156be402b..d762a5e15 100644 --- a/Library/Formula/dcraw.rb +++ b/Library/Formula/dcraw.rb @@ -15,7 +15,7 @@ class Dcraw <Formula depends_on 'little-cms' def install - system "#{ENV.cc} -o dcraw #{ENV['CFLAGS']} dcraw.c -lm -ljpeg -llcms" + system "#{ENV.cc} -o dcraw #{ENV.cflags} dcraw.c -lm -ljpeg -llcms" bin.install 'dcraw' end end diff --git a/Library/Formula/dos2unix.rb b/Library/Formula/dos2unix.rb index 59416be00..76bdf3dcc 100644 --- a/Library/Formula/dos2unix.rb +++ b/Library/Formula/dos2unix.rb @@ -9,7 +9,7 @@ class Dos2unix <Formula File.unlink 'dos2unix' # we don't use the Makefile as it doesn't optimize - system "#{ENV.cc} #{ENV['CFLAGS']} dos2unix.c -o dos2unix" + system "#{ENV.cc} #{ENV.cflags} dos2unix.c -o dos2unix" # make install is broken due to INSTALL file, but also it sucks so we'll do it # also Ruby 1.8 is broken, it won't allow you to move a symlink that's diff --git a/Library/Formula/foremost.rb b/Library/Formula/foremost.rb index 810ffd963..e5089a5ff 100644 --- a/Library/Formula/foremost.rb +++ b/Library/Formula/foremost.rb @@ -9,7 +9,7 @@ class Foremost <Formula inreplace "Makefile" do |s| s.gsub! "/usr/", "#{prefix}/" s.change_make_var! "RAW_CC", ENV.cc - s.change_make_var! "RAW_FLAGS", ENV['CFLAGS'] + s.change_make_var! "RAW_FLAGS", ENV.cflags end system "make mac" diff --git a/Library/Formula/launch.rb b/Library/Formula/launch.rb index 28cecc0b7..6b59173c5 100644 --- a/Library/Formula/launch.rb +++ b/Library/Formula/launch.rb @@ -7,7 +7,7 @@ class Launch <Formula def install rm_rf "launch" # We'll build it ourself, thanks. - system "#{ENV.cc} -o launch -std=c99 #{ENV['CFLAGS']} main.c -framework ApplicationServices" + system "#{ENV.cc} -o launch -std=c99 #{ENV.cflags} main.c -framework ApplicationServices" man1.install gzip('launch.1') bin.install 'launch' end diff --git a/Library/Formula/lockrun.rb b/Library/Formula/lockrun.rb index 4095faeb6..a6124c1f2 100644 --- a/Library/Formula/lockrun.rb +++ b/Library/Formula/lockrun.rb @@ -7,7 +7,7 @@ class Lockrun <Formula version '20090625' def install - system "#{ENV.cc} #{ENV['CFLAGS']} lockrun.c -o lockrun" + system "#{ENV.cc} #{ENV.cflags} lockrun.c -o lockrun" bin.install "lockrun" end end diff --git a/Library/Formula/lua.rb b/Library/Formula/lua.rb index 78ad09a32..fc5c86ada 100644 --- a/Library/Formula/lua.rb +++ b/Library/Formula/lua.rb @@ -18,7 +18,7 @@ class Lua <Formula # Use our CC/CFLAGS to compile. inreplace 'src/Makefile' do |s| s.remove_make_var! 'CC' - s.change_make_var! 'CFLAGS', "#{ENV['CFLAGS']} $(MYCFLAGS)" + s.change_make_var! 'CFLAGS', "#{ENV.cflags} $(MYCFLAGS)" end # Fix path in the config header diff --git a/Library/Formula/net-nuclear.rb b/Library/Formula/net-nuclear.rb index ac9a0dd24..8c266271d 100644 --- a/Library/Formula/net-nuclear.rb +++ b/Library/Formula/net-nuclear.rb @@ -29,7 +29,7 @@ END def install inreplace 'Makefile' do |s| s.remove_make_var! 'CC' - s.change_make_var! 'CFLAGS', "#{ENV['CFLAGS']} -I#{HOMEBREW_PREFIX}/include/SDL" + s.change_make_var! 'CFLAGS', "#{ENV.cflags} -I#{HOMEBREW_PREFIX}/include/SDL" s.change_make_var! 'LIBS', "-lSDLmain -lSDL -lSDL_mixer -lSDL_net -framework Cocoa" end diff --git a/Library/Formula/pwnat.rb b/Library/Formula/pwnat.rb index bf157140b..e6f9d79a6 100644 --- a/Library/Formula/pwnat.rb +++ b/Library/Formula/pwnat.rb @@ -9,7 +9,7 @@ class Pwnat <Formula def install inreplace "Makefile" do |s| s.change_make_var! "CC", ENV.cc - s.change_make_var! "CFLAGS", ENV['CFLAGS'] + s.change_make_var! "CFLAGS", ENV.cflags s.change_make_var! "LDFLAGS", "-lz" end diff --git a/Library/Formula/shapefile.rb b/Library/Formula/shapefile.rb index d9278de88..27740424d 100644 --- a/Library/Formula/shapefile.rb +++ b/Library/Formula/shapefile.rb @@ -9,7 +9,7 @@ class Shapefile <Formula dylib = lib+"libshp.#{version}.dylib" inreplace 'Makefile' do |s| - s.change_make_var! "CFLAGS", ENV['CFLAGS'] + s.change_make_var! "CFLAGS", ENV.cflags end system "make all" diff --git a/Library/Formula/simh.rb b/Library/Formula/simh.rb index d9da3c956..3dc29544f 100644 --- a/Library/Formula/simh.rb +++ b/Library/Formula/simh.rb @@ -16,7 +16,7 @@ class Simh <Formula # Use our compiler & flags, and don't create dSYMs. s.gsub! "CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .", - "CC = #{ENV.cc} #{ENV['CFLAGS']} -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I ." + "CC = #{ENV.cc} #{ENV.cflags} -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I ." end system "make USE_NETWORK=1 all" bin.install Dir['BIN/*'] diff --git a/Library/Formula/sleepwatcher.rb b/Library/Formula/sleepwatcher.rb index 201c98e24..6f95a3317 100644 --- a/Library/Formula/sleepwatcher.rb +++ b/Library/Formula/sleepwatcher.rb @@ -8,7 +8,7 @@ class Sleepwatcher <Formula def install # Adjust Makefile to build native binary only inreplace "sources/Makefile" do |s| - s.gsub! /^(CFLAGS)_PPC.*$/, "\\1 = #{ENV['CFLAGS']} -prebind" + s.gsub! /^(CFLAGS)_PPC.*$/, "\\1 = #{ENV.cflags} -prebind" s.gsub! /^(CFLAGS_X86)/, "#\\1" s.change_make_var! "BINDIR", "$(PREFIX)/sbin" s.change_make_var! "MANDIR", "$(PREFIX)/share/man" diff --git a/Library/Formula/tree.rb b/Library/Formula/tree.rb index 1a9de0a07..35ac0f372 100644 --- a/Library/Formula/tree.rb +++ b/Library/Formula/tree.rb @@ -6,7 +6,7 @@ class Tree <Formula md5 'c07ce9065667a23f27aca4de8ecccb10' def install - system "#{ENV.cc} #{ENV['CFLAGS']} -o tree tree.c strverscmp.c" + system "#{ENV.cc} #{ENV.cflags} -o tree tree.c strverscmp.c" bin.install "tree" man1.install "man/tree.1" diff --git a/Library/Formula/unix2dos.rb b/Library/Formula/unix2dos.rb index 597832844..0056a09df 100644 --- a/Library/Formula/unix2dos.rb +++ b/Library/Formula/unix2dos.rb @@ -7,7 +7,7 @@ class Unix2dos < Formula def install # Don't use the Makefile as it doesn't optimize - system "#{ENV.cc} #{ENV['CFLAGS']} unix2dos.c -o unix2dos" + system "#{ENV.cc} #{ENV.cflags} unix2dos.c -o unix2dos" bin.install "unix2dos" man1.install "unix2dos.1" end diff --git a/Library/Formula/unyaffs.rb b/Library/Formula/unyaffs.rb index 41519d62c..aa28b29c1 100644 --- a/Library/Formula/unyaffs.rb +++ b/Library/Formula/unyaffs.rb @@ -5,10 +5,7 @@ class Unyaffs <Formula homepage 'http://code.google.com/p/unyaffs/' def install - cc_args = ENV['CFLAGS'].split(' ') - (cc_args << ['-o', 'unyaffs', 'unyaffs.c']).flatten! - system ENV.cc, *cc_args - - bin.install 'unyaffs' + system "#{ENV.cc} #{ENV.cflags} -o unyaffs unyaffs.c" + bin.install 'unyaffs' end end |
