Merge pull request Homebrew#4 from rbrito/powerpc-fixes

PowerPC fixes
rbrito · Feb 28, 2012 · c8a9528 · c8a9528
2 parents f5ba675 + 998f857
commit c8a9528
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
@@ -59,11 +59,9 @@ def install
     args << "--enable-libass" if Formula.factory('libass').installed?
     args << "--disable-ffplay" unless ffplay?
 
-    # For 32-bit compilation under gcc 4.2, see:
-    # http://trac.macports.org/ticket/20938#comment:22
-    if MacOS.leopard? or Hardware.is_32_bit?
-      ENV.append_to_cflags "-mdynamic-no-pic"
-    end
+    # The -mdynamic-no-pic causes build failures with leopard/powerpc
+    # (32-bit, gcc 4.2) when compiling some internal libraries of ffmpeg
+    # 0.10.  So, we *don't* append it to CFLAGS.
 
     system "./configure", *args
 

diff --git a/Library/Formula/libvpx.rb b/Library/Formula/libvpx.rb
@@ -41,11 +41,8 @@ def install
     # see http://code.google.com/p/webm/issues/detail?id=401
     # Determine if the computer runs Darwin 9, 10, or 11 using uname -r.
     osver = %x[uname -r | cut -d. -f1].chomp
-    if MacOS.prefer_64_bit? then
-      args << "--target=x86_64-darwin#{osver}-gcc"
-    else
-      args << "--target=x86-darwin#{osver}-gcc"
-    end
+
+    args << "--target=ppc32-darwin#{osver}-gcc"
 
     mkdir 'macbuild' do
       system "../configure", *args