aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Bendowski2012-03-30 11:01:38 +0200
committerJack Nagel2012-04-15 15:27:03 -0500
commit30d2ffb8f51cd7a0f28e704bfca7f00eec282151 (patch)
treeefe6d6f2c5b606b669f0f46800ee010847872c74
parent304e4fc2f7ea0896798567e5c9429022a4fb914f (diff)
downloadhomebrew-30d2ffb8f51cd7a0f28e704bfca7f00eec282151.tar.bz2
Enable universal build on some SDL packages
- This allows pygame to run on an universal Python. Closes #11303. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
-rw-r--r--Library/Formula/sdl.rb6
-rw-r--r--Library/Formula/sdl_gfx.rb5
-rw-r--r--Library/Formula/sdl_image.rb5
-rw-r--r--Library/Formula/sdl_net.rb5
-rw-r--r--Library/Formula/sdl_ttf.rb5
5 files changed, 26 insertions, 0 deletions
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index e37c9ab29..f6555c920 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -19,9 +19,15 @@ class Sdl < Formula
inreplace files, '@prefix@', HOMEBREW_PREFIX
end
+ def options
+ [['--universal', 'Build universal binaries.']]
+ end
+
def install
Sdl.use_homebrew_prefix %w[sdl.pc.in sdl-config.in]
+ ENV.universal_binary if ARGV.build_universal?
+
# Sdl assumes X11 is present on UNIX
ENV.x11
system "./autogen.sh" if ARGV.build_head?
diff --git a/Library/Formula/sdl_gfx.rb b/Library/Formula/sdl_gfx.rb
index 0bc6e0172..e247ba0d2 100644
--- a/Library/Formula/sdl_gfx.rb
+++ b/Library/Formula/sdl_gfx.rb
@@ -7,7 +7,12 @@ class SdlGfx < Formula
depends_on 'sdl'
+ def options
+ [['--universal', 'Build universal binaries.']]
+ end
+
def install
+ ENV.universal_binary if ARGV.build_universal?
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--enable-static=no",
diff --git a/Library/Formula/sdl_image.rb b/Library/Formula/sdl_image.rb
index 45539f5c4..161362b08 100644
--- a/Library/Formula/sdl_image.rb
+++ b/Library/Formula/sdl_image.rb
@@ -8,7 +8,12 @@ class SdlImage < Formula
depends_on 'sdl'
+ def options
+ [['--universal', 'Build universal binaries.']]
+ end
+
def install
+ ENV.universal_binary if ARGV.build_universal?
ENV.x11 # For Freetype
Sdl.use_homebrew_prefix 'SDL_image.pc.in'
diff --git a/Library/Formula/sdl_net.rb b/Library/Formula/sdl_net.rb
index c5af28b87..4f5639cdd 100644
--- a/Library/Formula/sdl_net.rb
+++ b/Library/Formula/sdl_net.rb
@@ -7,7 +7,12 @@ class SdlNet < Formula
depends_on 'sdl'
+ def options
+ [['--universal', 'Build universal binaries.']]
+ end
+
def install
+ ENV.universal_binary if ARGV.build_universal?
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}",
"--disable-sdltest"
diff --git a/Library/Formula/sdl_ttf.rb b/Library/Formula/sdl_ttf.rb
index ab2d15cad..eee49b900 100644
--- a/Library/Formula/sdl_ttf.rb
+++ b/Library/Formula/sdl_ttf.rb
@@ -7,7 +7,12 @@ class SdlTtf < Formula
depends_on 'sdl'
+ def options
+ [['--universal', 'Build universal binaries.']]
+ end
+
def install
+ ENV.universal_binary if ARGV.build_universal?
ENV.x11 # For Freetype
system "./configure", "--disable-debug", "--disable-dependency-tracking",