diff options
Diffstat (limited to 'Library/Formula/postgresql.rb')
| -rw-r--r-- | Library/Formula/postgresql.rb | 49 |
1 files changed, 4 insertions, 45 deletions
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb index 8cbe7a3db..1d44b9275 100644 --- a/Library/Formula/postgresql.rb +++ b/Library/Formula/postgresql.rb @@ -2,8 +2,8 @@ require 'formula' class Postgresql < Formula homepage 'http://www.postgresql.org/' - url 'http://ftp.postgresql.org/pub/source/v9.2.4/postgresql-9.2.4.tar.bz2' - sha1 '75b53c884cb10ed9404747b51677358f12082152' + url 'http://ftp.postgresql.org/pub/source/v9.3.0/postgresql-9.3.0.tar.bz2' + sha256 '784e5db7d8fd69b08ddb125c4452211e04b089516359a5cf72d292cade7c728e' option '32-bit' option 'no-perl', 'Build without Perl support' @@ -23,7 +23,6 @@ class Postgresql < Formula cause 'Miscompilation resulting in segfault on queries' end - # Fix PL/Python build: https://github.com/mxcl/homebrew/issues/11162 # Fix uuid-ossp build issues: http://archives.postgresql.org/pgsql-general/2012-07/msg00654.php def patches DATA @@ -60,11 +59,6 @@ class Postgresql < Formula ENV.append 'LIBS', `uuid-config --libs`.strip end - if build.with? 'python' - args << "ARCHFLAGS='-arch #{MacOS.preferred_arch}'" - check_python_arch - end - if build.build_32_bit? ENV.append 'CFLAGS', "-arch #{MacOS.preferred_arch}" ENV.append 'LDFLAGS', "-arch #{MacOS.preferred_arch}" @@ -74,27 +68,6 @@ class Postgresql < Formula system "make install-world" end - def check_python_arch - # On 64-bit systems, we need to look for a 32-bit Framework Python. - # The configure script prefers this Python version, and if it doesn't - # have 64-bit support then linking will fail. - framework_python = Pathname.new("/Library/Frameworks/Python.framework/Versions/Current/Python") - return unless framework_python.exist? - unless (archs_for_command(framework_python)).include? :x86_64 - opoo "Detected a framework Python that does not have 64-bit support in:" - puts <<-EOS.undent - #{framework_python} - - The configure script seems to prefer this version of Python over any others, - so you may experience linker problems as described in: - http://osdir.com/ml/pgsql-general/2009-09/msg00160.html - - To fix this issue, you may need to either delete the version of Python - shown above, or move it out of the way before brewing PostgreSQL. - EOS - end - end - def caveats s = <<-EOS.undent initdb #{var}/postgres -E utf8 # create a database @@ -105,11 +78,8 @@ class Postgresql < Formula you may need to remove the previous version first. See: https://github.com/mxcl/homebrew/issues/issue/2510 - To migrate existing data from a previous major version (pre-9.2) of PostgreSQL, see: - http://www.postgresql.org/docs/9.2/static/upgrading.html - - Some machines may require provisioning of shared memory: - http://www.postgresql.org/docs/9.2/static/kernel-resources.html#SYSVIPC + To migrate existing data from a previous major version (pre-9.3) of PostgreSQL, see: + http://www.postgresql.org/docs/9.3/static/upgrading.html EOS s << "\n" << gem_caveats if MacOS.prefer_64_bit? @@ -157,17 +127,6 @@ end __END__ ---- a/src/pl/plpython/Makefile 2011-09-23 08:03:52.000000000 +1000 -+++ b/src/pl/plpython/Makefile 2011-10-26 21:43:40.000000000 +1100 -@@ -24,8 +24,6 @@ - # Darwin (OS X) has its own ideas about how to do this. - ifeq ($(PORTNAME), darwin) - shared_libpython = yes --override python_libspec = -framework Python --override python_additional_libs = - endif - - # If we don't have a shared library and the platform doesn't allow it --- a/contrib/uuid-ossp/uuid-ossp.c 2012-07-30 18:34:53.000000000 -0700 +++ b/contrib/uuid-ossp/uuid-ossp.c 2012-07-30 18:35:03.000000000 -0700 @@ -9,6 +9,8 @@ |