Changeset 97905

Timestamp:

Sep 19, 2012, 12:55:04 PM (12 years ago)

Author:

michaelld@…

Message:

qca-cyrus-sasl : handle +universal correctly.

Location:

trunk/dports/devel/qca-cyrus-sasl

Files:

• Portfile (modified) (2 diffs)
• files/patch-configure.diff (modified) (1 diff)

trunk/dports/devel/qca-cyrus-sasl/Portfile

@@ -36 +36 @@
 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
@@ -41 +44 @@
                      --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 {

trunk/dports/devel/qca-cyrus-sasl/files/patch-configure.diff

@@ -1 @@
---- 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)