[70340] trunk/dports/databases/oracle-instantclient/Portfile

[ryandesign at macports.org]

Revision: 70340
          http://trac.macports.org/changeset/70340
Author:   ryandesign at macports.org
Date:     2010-08-06 14:06:56 -0700 (Fri, 06 Aug 2010)
Log Message:
-----------
oracle-instantclient: fix build when universal_archs does not contain the architectures being built; see #25966

Modified Paths:
--------------
    trunk/dports/databases/oracle-instantclient/Portfile

Modified: trunk/dports/databases/oracle-instantclient/Portfile
===================================================================
--- trunk/dports/databases/oracle-instantclient/Portfile	2010-08-06 20:18:07 UTC (rev 70339)
+++ trunk/dports/databases/oracle-instantclient/Portfile	2010-08-06 21:06:56 UTC (rev 70340)
@@ -61,12 +61,15 @@
     variant universal {}
 }
 
+# merge() requires universal_archs to be set correctly. Since we use merge()
+# even when not building universal we must always set universal_archs correctly.
 if {[variant_isset universal]} {
-#    set my_requested_archs ${configure.universal_archs}
-    set my_requested_archs {x86_64 i386}
+    # The only supported universal build is x86_64 i386.
+    configure.universal_archs x86_64 i386
 } else {
-    set my_requested_archs ${configure.build_arch}
+    configure.universal_archs ${configure.build_arch}
 }
+set my_requested_archs ${configure.universal_archs}
 
 distfiles
 foreach my_requested_arch ${my_requested_archs} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100806/33fbf373/attachment.html>