[61539] trunk/dports/security/cyrus-sasl2/Portfile

[jeremyhu at macports.org]

Revision: 61539
          http://trac.macports.org/changeset/61539
Author:   jeremyhu at macports.org
Date:     2009-12-13 20:37:05 -0800 (Sun, 13 Dec 2009)
Log Message:
-----------
cyrus-sasl2: Ugly workaround for lack of +universal support which was blocking qt universal

This is not "the" solution, but it gets the job done for now.  Upstream has
used some bad form with the build system, and someone needs to look into a
proper fix later.

Patch comes from ticket #17357.

Furthermore, you will need to deactivate the installer version before upgrading +universal.

Modified Paths:
--------------
    trunk/dports/security/cyrus-sasl2/Portfile

Modified: trunk/dports/security/cyrus-sasl2/Portfile
===================================================================
--- trunk/dports/security/cyrus-sasl2/Portfile	2009-12-14 03:54:27 UTC (rev 61538)
+++ trunk/dports/security/cyrus-sasl2/Portfile	2009-12-14 04:37:05 UTC (rev 61539)
@@ -1,9 +1,12 @@
 # $Id$
 
 PortSystem	1.0
+PortGroup muniversal 1.0
+PortGroup archcheck 1.0
 
 name			cyrus-sasl2
 version			2.1.23
+revision                1
 categories		security net
 maintainers		jmpp landonf openmaintainer
 description		SASL is an authentication library.
@@ -48,17 +51,24 @@
 
 use_parallel_build  yes
 
-universal_variant no
+#universal_variant no
 
 # This is a start towards universal... lib/Makefile.am and sasldb/Makefile.am need to be updated to not do blind ar-fu
 #post-extract {
 #	system "rm ${worksrcpath}/config/libtool.m4"
 #}
-#
+
 #use_autoreconf yes
 #autoreconf.args -fvi
 #autoreconf.env ACLOCAL="aclocal -I${worksrcpath}/cmulocal -I${worksrcpath}/config"
 
+# This is a horrible hackaround as replacing the ar-fu as mentioned above is non-trivial
+pre-build {    
+    if {[variant_isset universal] && [file exists ${worksrcpath}-i386/libtool]} {
+        reinplace -E -- "s|^CC=\\\"(\[^\\\"\]+)\\\"|CC=\"\\1 -arch i386\"|g" ${worksrcpath}-i386/libtool
+    }
+}
+
 destroot.keepdirs \
     ${destroot}${prefix}/var/state/saslauthd \
     ${destroot}${prefix}/var/pwcheck
@@ -84,6 +94,7 @@
 	}
 }
 
+# TODO: Uhm... dependencies?
 variant sql description "Enable SQL support" { configure.args-append --enable-sql }
 
 variant static description "Build static library" { configure.args-append --enable-static }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091213/47e79f1c/attachment.html>