[61769] trunk/dports/x11/mesa

[ryandesign at macports.org]

Revision: 61769
          http://trac.macports.org/changeset/61769
Author:   ryandesign at macports.org
Date:     2009-12-20 21:14:02 -0800 (Sun, 20 Dec 2009)
Log Message:
-----------
mesa: fix universal build when "file" port is installed; see #22963

Modified Paths:
--------------
    trunk/dports/x11/mesa/Portfile

Added Paths:
-----------
    trunk/dports/x11/mesa/files/patch-mklib.diff

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-12-21 04:54:18 UTC (rev 61768)
+++ trunk/dports/x11/mesa/Portfile	2009-12-21 05:14:02 UTC (rev 61769)
@@ -58,6 +58,7 @@
 patch.pre_args -p1
 patchfiles \
 	patch-gen_gl_h.sh.diff \
+	patch-mklib.diff \
 	mesa-7.2-drm_headers.patch
 
 build.target default

Added: trunk/dports/x11/mesa/files/patch-mklib.diff
===================================================================
--- trunk/dports/x11/mesa/files/patch-mklib.diff	                        (rev 0)
+++ trunk/dports/x11/mesa/files/patch-mklib.diff	2009-12-21 05:14:02 UTC (rev 61769)
@@ -0,0 +1,29 @@
+--- a/bin/mklib.orig	2009-08-23 22:52:57.000000000 -0500
++++ b/bin/mklib	2009-12-20 22:57:50.000000000 -0600
+@@ -724,22 +724,10 @@
+ 
+ 	    # examine first object to determine ABI
+     	    set ${OBJECTS}
+-            ABI_PPC=`file $1 | grep ' ppc'`
+-            ABI_I386=`file $1 | grep ' i386'`
+-            ABI_PPC64=`file $1 | grep ' ppc64'`
+-            ABI_X86_64=`file $1 | grep ' x86_64'`
+-            if [ "${ABI_PPC}" ] ; then
+-                OPTS="${OPTS} -arch ppc"
+-            fi
+-            if [ "${ABI_I386}" ] ; then
+-                OPTS="${OPTS} -arch i386"
+-            fi
+-            if [ "${ABI_PPC64}" ] ; then
+-                OPTS="${OPTS} -arch ppc64"
+-            fi
+-            if [ "${ABI_X86_64}" ] ; then
+-                OPTS="${OPTS} -arch x86_64"
+-            fi
++            ABIS=`lipo -info $1 | sed s/.*://`
++            for ABI in $ABIS; do
++                OPTS="${OPTS} -arch ${ABI}"
++            done
+ 
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091220/bae413cf/attachment.html>