Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove unnecessary dependencies

Signed-off-by: Eashwar Ranganathan <crystal.dome@gmail.com>
  • Loading branch information...
commit 2cfc57510c736fe44204dbd4a01c3fe38fa2b979 1 parent 44b9763
@phoenixsong6 phoenixsong6 authored
View
3  Formula/php53-midgard2.rb
@@ -15,8 +15,7 @@ def install
ENV.universal_binary
system "phpize"
- system "./configure", "--prefix=#{prefix}",
- "--with-php-config=/usr/bin/php-config"
+ system "./configure", "--prefix=#{prefix}"
system "make"
prefix.install "modules/midgard2.so"
end
View
5 Formula/php53-redis.rb
@@ -1,9 +1,5 @@
require 'formula'
-def redis_installed?
- `which redis-server`.length > 0
-end
-
class Php53Redis < Formula
homepage 'https://github.com/nicolasff/phpredis'
url 'https://github.com/nicolasff/phpredis/tarball/2.2.0'
@@ -11,7 +7,6 @@ class Php53Redis < Formula
head 'https://github.com/nicolasff/phpredis.git'
depends_on 'autoconf' => :build
- depends_on 'redis' => :recommended unless redis_installed?
fails_with :clang do
build 318
View
13 Formula/php53.rb
@@ -1,9 +1,5 @@
require 'formula'
-def mysql_installed?
- `which mysql_config`.length > 0
-end
-
def postgres_installed?
`which pg_config`.length > 0
end
@@ -31,10 +27,6 @@ class Php53 < Formula
# Sanity Checks
if ARGV.include? '--with-mysql' and ARGV.include? '--with-mariadb'
raise "Cannot specify more than one MySQL variant to build against."
- elsif ARGV.include? '--with-mysql'
- depends_on 'mysql' => :recommended unless mysql_installed?
- elsif ARGV.include? '--with-mariadb'
- depends_on 'mariadb' => :recommended unless mysql_installed?
end
if ARGV.include? '--with-pgsql'
@@ -172,9 +164,12 @@ def install
args << "--with-pdo-mysql=mysqlnd"
end
- if ARGV.include? '--with-pgsql'
+ if ARGV.include? '--with-pgsql' and File.directory? Formula.factory('postgresql').prefix.to_s
args << "--with-pgsql=#{Formula.factory('postgresql').prefix}"
args << "--with-pdo-pgsql=#{Formula.factory('postgresql').prefix}"
+ elsif ARGV.include? '--with-pgsql'
+ args << "--with-pgsql=#{`pg_config --includedir`}"
+ args << "--with-pdo-pgsql=#{`which pg_config`}"
end
if ARGV.include? '--with-unixodbc'
View
3  Formula/php54-midgard2.rb
@@ -15,8 +15,7 @@ def install
ENV.universal_binary
system "phpize"
- system "./configure", "--prefix=#{prefix}",
- "--with-php-config=/usr/bin/php-config"
+ system "./configure", "--prefix=#{prefix}"
system "make"
prefix.install "modules/midgard2.so"
end
View
5 Formula/php54-redis.rb
@@ -1,9 +1,5 @@
require 'formula'
-def redis_installed?
- `which redis-server`.length > 0
-end
-
class Php54Redis < Formula
homepage 'https://github.com/nicolasff/phpredis'
url 'https://github.com/nicolasff/phpredis/tarball/2.2.0'
@@ -11,7 +7,6 @@ class Php54Redis < Formula
head 'https://github.com/nicolasff/phpredis.git'
depends_on 'autoconf' => :build
- depends_on 'redis' => :recommended unless redis_installed?
fails_with :clang do
build 318
View
13 Formula/php54.rb
@@ -1,9 +1,5 @@
require 'formula'
-def mysql_installed?
- `which mysql_config`.length > 0
-end
-
def postgres_installed?
`which pg_config`.length > 0
end
@@ -32,10 +28,6 @@ class Php54 < Formula
# Sanity Checks
if ARGV.include? '--with-mysql' and ARGV.include? '--with-mariadb'
raise "Cannot specify more than one MySQL variant to build against."
- elsif ARGV.include? '--with-mysql'
- depends_on 'mysql' => :recommended unless mysql_installed?
- elsif ARGV.include? '--with-mariadb'
- depends_on 'mariadb' => :recommended unless mysql_installed?
end
if ARGV.include? '--with-pgsql'
@@ -181,9 +173,12 @@ def install
args << "--with-pdo-mysql=mysqlnd"
end
- if ARGV.include? '--with-pgsql'
+ if ARGV.include? '--with-pgsql' and File.directory? Formula.factory('postgresql').prefix.to_s
args << "--with-pgsql=#{Formula.factory('postgresql').prefix}"
args << "--with-pdo-pgsql=#{Formula.factory('postgresql').prefix}"
+ elsif ARGV.include? '--with-pgsql'
+ args << "--with-pgsql=#{`pg_config --includedir`}"
+ args << "--with-pdo-pgsql=#{`which pg_config`}"
end
if ARGV.include? '--with-unixodbc'
Please sign in to comment.
Something went wrong with that request. Please try again.