get rid of accidental regression.

patcoll · Feb 20, 2010 · 4ad5fa4 · 4ad5fa4
1 parent dc759e7
commit 4ad5fa4
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 27 deletions.
diff --git a/lib/buildphp.rb b/lib/buildphp.rb
@@ -39,8 +39,12 @@ def system_is_64_bit?
   system("sysctl hw.cpu64bit_capable > /dev/null 2>&1")
 end
 
-def is_linux?
-  RUBY_PLATFORM =~ /linux/i
+def x86_64?
+  RUBY_PLATFORM =~ /x86_64/i
+end
+
+def mac?
+  RUBY_PLATFORM =~ /darwin/i
 end
 
 module VersionShortcut

diff --git a/lib/buildphp/package.rb b/lib/buildphp/package.rb
@@ -139,7 +139,7 @@ def flags
       # end
 
       # enable PIC
-      if is_linux? and system_is_64_bit?
+      if x86_64?
         f << "-fPIC"
       elsif RUBY_PLATFORM =~ /darwin/i
         # -fno-common enables PIC on Mac OS

diff --git a/lib/buildphp/packages/apache.rb b/lib/buildphp/packages/apache.rb
@@ -8,7 +8,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--enable-pie" if is_linux? and system_is_64_bit?
+    c << "--enable-pie" if x86_64?
     c << %W(
       --prefix="#{@prefix}"
       --with-included-apr

diff --git a/lib/buildphp/packages/bz2.rb b/lib/buildphp/packages/bz2.rb
@@ -20,7 +20,7 @@
   # Ideally, we should detect the platform and use the appropriate PIC flag for that platform.
   # 
   # If we don't do this, while compiling PHP will complain that bz2 was not compiled with PIC.
-  if is_linux? and system_is_64_bit?
+  if x86_64?
     # use GNU sed options because we're on linux
     @compile_cmd = "sed -r -i.bak -e 's/^(CFLAGS=)(.+)$/\\1-fPIC \\2/' Makefile && #{@compile_cmd}"
   end

diff --git a/lib/buildphp/packages/curl.rb b/lib/buildphp/packages/curl.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-ssl"
     c << "--with-zlib=#{FACTORY.zlib.prefix}"

diff --git a/lib/buildphp/packages/expat.rb b/lib/buildphp/packages/expat.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/freetype.rb b/lib/buildphp/packages/freetype.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--without-zlib"
   end

diff --git a/lib/buildphp/packages/gd.rb b/lib/buildphp/packages/gd.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-libiconv-prefix=#{FACTORY.iconv.prefix}"
     c << "--with-freetype=#{FACTORY.freetype.prefix}"

diff --git a/lib/buildphp/packages/gettext.rb b/lib/buildphp/packages/gettext.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--disable-java"
     c << "--disable-native-java"

diff --git a/lib/buildphp/packages/iconv.rb b/lib/buildphp/packages/iconv.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--enable-relocatable"
     c << "--enable-static"

diff --git a/lib/buildphp/packages/jpeg.rb b/lib/buildphp/packages/jpeg.rb
@@ -11,7 +11,7 @@ def package_dir
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/libtool.rb b/lib/buildphp/packages/libtool.rb
@@ -11,7 +11,7 @@ def package_dir
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/mcrypt.rb b/lib/buildphp/packages/mcrypt.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/mhash.rb b/lib/buildphp/packages/mhash.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/mssql.rb b/lib/buildphp/packages/mssql.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-tdsver=8.0"
     c << "--enable-odbc"

diff --git a/lib/buildphp/packages/mysql.rb b/lib/buildphp/packages/mysql.rb
@@ -9,7 +9,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-plugins=max"
     c << "--with-charset=utf8"

diff --git a/lib/buildphp/packages/ncurses.rb b/lib/buildphp/packages/ncurses.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--without-debug"
     c << "--with-shared"

diff --git a/lib/buildphp/packages/odbc.rb b/lib/buildphp/packages/odbc.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << "./configure"
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--disable-gui"
     c << "--enable-iconv"

diff --git a/lib/buildphp/packages/openssl.rb b/lib/buildphp/packages/openssl.rb
@@ -9,7 +9,7 @@
     c << './config'
     c << "-I#{Buildphp::INSTALL_TO}/include"
     c << "-L#{Buildphp::INSTALL_TO}/lib"
-    c << "-fPIC" if is_linux? and system_is_64_bit?
+    c << "-fPIC" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "zlib-dynamic"
     c << "no-krb5"

diff --git a/lib/buildphp/packages/pcre.rb b/lib/buildphp/packages/pcre.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << './configure'
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--enable-utf8"
     c << "--enable-unicode-properties"

diff --git a/lib/buildphp/packages/perl.rb b/lib/buildphp/packages/perl.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << 'sh Configure -de'
-    c << "-Duse64bitall" if is_linux? and system_is_64_bit?
+    c << "-Duse64bitall" if system_is_64_bit?
     c << "-Dprefix='#{@prefix}'"
   end
 

diff --git a/lib/buildphp/packages/php.rb b/lib/buildphp/packages/php.rb
@@ -57,7 +57,7 @@ def modules_ini
 
   configure do |parts|
     parts << './configure'
-    parts << "--with-pic" if is_linux? and system_is_64_bit?
+    parts << "--with-pic" if x86_64?
     parts << "--with-gnu-ld"
 
     # add configuration flags based on which interface we're building

diff --git a/lib/buildphp/packages/pkg_config.rb b/lib/buildphp/packages/pkg_config.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << './configure'
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/png.rb b/lib/buildphp/packages/png.rb
@@ -8,7 +8,7 @@
 
   configure do |c|
     c << './configure'
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
   end
 

diff --git a/lib/buildphp/packages/xml.rb b/lib/buildphp/packages/xml.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << './configure'
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-iconv=#{FACTORY.iconv.prefix}"
     c << "--with-zlib=#{FACTORY.zlib.prefix}"

diff --git a/lib/buildphp/packages/xsl.rb b/lib/buildphp/packages/xsl.rb
@@ -7,7 +7,7 @@
 
   configure do |c|
     c << './configure'
-    c << "--with-pic" if is_linux? and system_is_64_bit?
+    c << "--with-pic" if x86_64?
     c << "--prefix=#{@prefix}"
     c << "--with-libxml-prefix=#{FACTORY.xml.prefix}"
     c << "--with-libxml-include-prefix=#{FACTORY.xml.prefix}/include"