[97905] trunk/dports/devel/qca-cyrus-sasl
michaelld at macports.org
michaelld at macports.org
Wed Sep 19 05:55:04 PDT 2012
Revision: 97905
http://trac.macports.org//changeset/97905
Author: michaelld at macports.org
Date: 2012-09-19 05:55:04 -0700 (Wed, 19 Sep 2012)
Log Message:
-----------
qca-cyrus-sasl : handle +universal correctly.
Modified Paths:
--------------
trunk/dports/devel/qca-cyrus-sasl/Portfile
trunk/dports/devel/qca-cyrus-sasl/files/patch-configure.diff
Modified: trunk/dports/devel/qca-cyrus-sasl/Portfile
===================================================================
--- trunk/dports/devel/qca-cyrus-sasl/Portfile 2012-09-19 12:28:12 UTC (rev 97904)
+++ trunk/dports/devel/qca-cyrus-sasl/Portfile 2012-09-19 12:55:04 UTC (rev 97905)
@@ -35,12 +35,21 @@
# forcing patching of multiple files.
patchfiles patch-configure.diff
+# --disable-dependency-tracking is not recognized.
+configure.universal_args-delete --disable-dependency-tracking
+
# qca-gnupg does not use --prefix
configure.pre_args
configure.args --verbose \
--qtdir=${qt_dir} \
--with-sasl-inc=${prefix}/include
+post-patch {
+ # set arch type(s)
+ reinplace "s|@ARCHES@|${qt_arch_types}|g" \
+ ${worksrcpath}/configure
+}
+
post-destroot {
# fix library path of installed library/ies
foreach fixfile [exec find ${destroot}${qt_dir} -name "*.dylib" | \
Modified: trunk/dports/devel/qca-cyrus-sasl/files/patch-configure.diff
===================================================================
--- trunk/dports/devel/qca-cyrus-sasl/files/patch-configure.diff 2012-09-19 12:28:12 UTC (rev 97904)
+++ trunk/dports/devel/qca-cyrus-sasl/files/patch-configure.diff 2012-09-19 12:55:04 UTC (rev 97905)
@@ -1,6 +1,33 @@
---- configure_orig 2010-08-04 20:41:38.000000000 -0400
-+++ configure 2010-08-04 20:42:10.000000000 -0400
-@@ -551,18 +551,7 @@
+--- configure.orig 2012-09-19 08:46:23.000000000 -0400
++++ configure 2012-09-19 08:49:28.000000000 -0400
+@@ -518,24 +518,8 @@
+ bool exec()
+ {
+ #ifdef Q_OS_MAC
+- if(qc_getenv("QC_UNIVERSAL") == "Y")
+- {
+- qc_universal_enabled = true;
+-
+- QString str =
+- "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
+- " CONFIG += x86 ppc\n"
+- "}\n";
+-
+- QString sdk = qc_getenv("QC_MAC_SDK");
+- if(!sdk.isEmpty())
+- {
+- str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
+- qc_universal_sdk = sdk;
+- }
+-
+- conf->addExtra(str);
+- }
++ QString str = "CONFIG += @ARCHES@\n";
++ conf->addExtra(str);
+ #endif
+ return true;
+ }
+@@ -551,18 +535,7 @@
// based on crypto.prf. any changes made to that file need to be tracked here.
static QString internal_crypto_prf(const QString &incdir, const QString &libdir)
{
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120919/28dfac8d/attachment.html>
More information about the macports-changes
mailing list