tools: osxcross-macports: Avoid universal packages if not explicitly requested

[jbruechert]

The motivation behind doing this was that macdeployqt seems to be unable to handle universal libraries, and they would use more space than necessary anyway.

[kmatheussen]

Thanks!

[kmatheussen]

I had to modify the patch a little bit. I also wanted it to resort to using universal package if individual package does not exist:

diff --git a/tools/osxcross-macports b/tools/osxcross-macports
index a3f45c9..f4b694c 100755
--- a/tools/osxcross-macports
+++ b/tools/osxcross-macports
@@ -290,13 +290,21 @@ getPkgUrl()
     return
   fi
 
-  verboseMsg " candidates for $pkgname:"
+  verboseMsg " candidates for $pkgname ($OSXVERSION / $ARCH):"
 
   for p in $pkgs; do
     verboseMsg "  $p"
   done
 
   local pkg=$(echo "$pkgs" | grep $OSXVERSION | grep $ARCH | uniq | tail -n1)
+  if [ $ARCH != "i386-x86_64" ]; then
+      local pkg=$(echo "$pkgs" | grep $OSXVERSION | grep $ARCH | grep --invert-match universal | uniq | tail -n1)
+      if [ -z "$pkg" ]; then
+          pkg=$(echo "$pkgs" | grep $OSXVERSION | grep $ARCH | uniq | tail -n1)
+      fi
+  else
+      local pkg=$(echo "$pkgs" | grep $OSXVERSION | grep $ARCH | uniq | tail -n1)
+  fi
   if [ -z "$pkg" ]; then
     pkg=$(echo "$pkgs" | grep $OSXVERSION | grep "noarch" | uniq | tail -n1)
   fi

[nephatrine]

How do you explicitly request universal libraries with osxcross-macports?