Merge pull request Homebrew#6 from rbrito/powerpc

PowerPC fixes
rbrito · Mar 7, 2012 · 0900980 · 0900980
2 parents c62f480 + 21527a1
commit 0900980
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 51 deletions.
diff --git a/Library/Formula/fftw.rb b/Library/Formula/fftw.rb
@@ -15,29 +15,13 @@ def install
     # check for gfortran
     args << "--disable-fortran" unless which 'gfortran'
 
-    # single precision
-    # enable-sse only works with single
+    # enable-altivec
     system "./configure", "--enable-single",
-                          "--enable-sse",
+                          "--enable-altivec",
+                          "--enable-fma",
                           *args
     system "make install"
 
-    # clean up so we can compile the double precision variant
-    system "make clean"
-
-    # double precision
-    # enable-sse2 only works with double precision (default)
-    system "./configure", "--enable-sse2", *args
-    system "make install"
-
-    # clean up so we can compile the long-double precision variant
-    system "make clean"
-
-    # long-double precision
-    # no SIMD optimization available
-    system "./configure", "--enable-long-double", *args
-    system "make install"
-
     #wtf file?
     (info+'dir').unlink
   end

diff --git a/Library/Formula/media-info.rb b/Library/Formula/media-info.rb
@@ -8,25 +8,7 @@ class MediaInfo < Formula
   depends_on 'pkg-config' => :build
 
   def install
-    cd 'ZenLib/Project/GNU/Library' do
-      system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                            "--prefix=#{prefix}"
-      system "make"
-    end
-
-    cd "MediaInfoLib/Project/GNU/Library" do
-      args = ["--disable-debug",
-              "--disable-dependency-tracking",
-              "--with-libcurl",
-              "--prefix=#{prefix}"]
-      system "./configure", *args
-      system "make install"
-    end
-
-    cd "MediaInfo/Project/GNU/CLI" do
-      system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                            "--prefix=#{prefix}"
-      system "make install"
-    end
+    system "./CLI_Compile.sh --prefix=#{prefix}"
+    system "cd MediaInfo/Project/GNU/CLI && make install"
   end
 end
diff --git a/Library/Formula/qt.rb b/Library/Formula/qt.rb
@@ -61,13 +61,7 @@ def install
       args << "-nomake" << "demos" << "-nomake" << "examples"
     end
 
-    if MacOS.prefer_64_bit? or ARGV.build_universal?
-      args << '-arch' << 'x86_64'
-    end
-
-    if !MacOS.prefer_64_bit? or ARGV.build_universal?
-      args << '-arch' << 'x86'
-    end
+    args << '-arch' << 'ppc'
 
     if ARGV.include? '--with-debug-and-release'
       args << "-debug-and-release"
@@ -78,10 +72,6 @@ def install
       args << "-release"
     end
 
-    # Compilation currently fails with the newer versions of clang
-    # shipped with Xcode 4.3+
-    ENV.llvm if MacOS.clang_version.to_f <= 3.1
-
     system "./configure", *args
     system "make"
     ENV.j1

diff --git a/Library/Formula/tokyo-cabinet.rb b/Library/Formula/tokyo-cabinet.rb
@@ -6,7 +6,7 @@ class TokyoCabinet < Formula
   md5 '3d94fe2aebf5d9ff0478ed895bc46fc9'
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--enable-fastest"
+    system "./configure", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end