This repository has been archived by the owner. It is now read-only.

postgresql: adding support for --universal. #14036

Closed
wants to merge 4 commits into
from

Conversation

Projects
None yet
3 participants
@mrjbq7
Contributor

mrjbq7 commented Aug 8, 2012

This fixes #14032.

It uses the patch files that MacPorts uses post-configure.

Library/Formula/postgresql.rb
@@ -65,6 +67,9 @@ def install
ENV.O2 if Hardware.intel_family == :core
system "./configure", *args
+ if ENV.universal_binary
+ system "curl https://trac.macports.org/export/96361/trunk/dports/databases/postgresql91/files/pg_config.h.ed | ed - ./src/include/pg_config.h"
+ system "curl https://trac.macports.org/export/96361/trunk/dports/databases/postgresql91/files/ecpg_config.h.ed | ed - ./src/interfaces/ecpg/include/ecpg_config.h"

This comment has been minimized.

Show comment Hide comment
@jacknagel

jacknagel Aug 8, 2012

Contributor

You mean if ARGV.build_universal?, and also this is missing an end.

@jacknagel

jacknagel Aug 8, 2012

Contributor

You mean if ARGV.build_universal?, and also this is missing an end.

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 8, 2012

Contributor

@jacknagel Thanks, sometimes I need those Ruby reminders!

Contributor

mrjbq7 commented Aug 8, 2012

@jacknagel Thanks, sometimes I need those Ruby reminders!

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 8, 2012

Contributor

Btw, fixed now.

Contributor

mrjbq7 commented Aug 8, 2012

Btw, fixed now.

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 8, 2012

Contributor

Also, added --universal for ossp-uuid which is a dependency of postgresql.

Contributor

mrjbq7 commented Aug 8, 2012

Also, added --universal for ossp-uuid which is a dependency of postgresql.

@adamv

This comment has been minimized.

Show comment Hide comment
@adamv

adamv Aug 8, 2012

Contributor

Can the PG curls not be done as patches?

Contributor

adamv commented Aug 8, 2012

Can the PG curls not be done as patches?

@adamv

This comment has been minimized.

Show comment Hide comment
@adamv

adamv Aug 8, 2012

Rewrite as if universal ... else if 32 bit ...

Rewrite as if universal ... else if 32 bit ...

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 8, 2012

Contributor

@adamv MacPorts applies these patches post-configure. I tried to patch the pg_config.h.in and ecpg_config.h.in files before configure in the patches section but it wasn't working properly, so I defaulted to their way.

Contributor

mrjbq7 commented Aug 8, 2012

@adamv MacPorts applies these patches post-configure. I tried to patch the pg_config.h.in and ecpg_config.h.in files before configure in the patches section but it wasn't working properly, so I defaulted to their way.

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 8, 2012

Contributor

Fixed if universal else if 32-bit.

Contributor

mrjbq7 commented Aug 8, 2012

Fixed if universal else if 32-bit.

@adamv

This comment has been minimized.

Show comment Hide comment
@adamv

adamv Aug 10, 2012

Contributor

Please squash to a single commit for review, thanks

Contributor

adamv commented Aug 10, 2012

Please squash to a single commit for review, thanks

@mrjbq7

This comment has been minimized.

Show comment Hide comment
@mrjbq7

mrjbq7 Aug 10, 2012

Contributor

Okay, I'll resubmit!

Contributor

mrjbq7 commented Aug 10, 2012

Okay, I'll resubmit!

@mrjbq7 mrjbq7 closed this Aug 10, 2012

@xu-cheng xu-cheng locked and limited conversation to collaborators Feb 16, 2016

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.