[149681] trunk/dports/graphics/babl

mcalhoun at macports.org mcalhoun at macports.org
Wed Jun 29 06:04:59 PDT 2016


Revision: 149681
          https://trac.macports.org/changeset/149681
Author:   mcalhoun at macports.org
Date:     2016-06-29 06:04:59 -0700 (Wed, 29 Jun 2016)
Log Message:
-----------
babl: allow 32-bit and universal builds
no revbump since port builds successfully or not at all

Modified Paths:
--------------
    trunk/dports/graphics/babl/Portfile

Added Paths:
-----------
    trunk/dports/graphics/babl/files/
    trunk/dports/graphics/babl/files/patch-config.guess.diff

Modified: trunk/dports/graphics/babl/Portfile
===================================================================
--- trunk/dports/graphics/babl/Portfile	2016-06-29 11:15:54 UTC (rev 149680)
+++ trunk/dports/graphics/babl/Portfile	2016-06-29 13:04:59 UTC (rev 149681)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           muniversal 1.0
 
 name                babl
 conflicts           babl-devel
@@ -30,6 +31,19 @@
 configure.args      --disable-silent-rules \
                     ac_cv_prog_AWK=/usr/bin/awk
 
+# have config.guess determine processor type (i386 or x86_64) for all macOS versions,
+# so we can specify a 32-bit build
+patchfiles-append   patch-config.guess.diff
+
+# CC_FOR_BUILD is used by config.guess to determine processor type
+if {![variant_isset universal]} {
+    configure.env-append CC_FOR_BUILD="${configure.cc} ${configure.cc_archflags}"
+} else {
+    foreach arch ${configure.universal_archs} {
+        lappend merger_configure_env(${arch})  CC_FOR_BUILD='${configure.cc} -arch ${arch}'
+    }
+}
+
 livecheck.type      regex
 livecheck.url       http://download.gimp.org/pub/${name}/${branch}/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)+)"

Added: trunk/dports/graphics/babl/files/patch-config.guess.diff
===================================================================
--- trunk/dports/graphics/babl/files/patch-config.guess.diff	                        (rev 0)
+++ trunk/dports/graphics/babl/files/patch-config.guess.diff	2016-06-29 13:04:59 UTC (rev 149681)
@@ -0,0 +1,30 @@
+--- config.guess.orig	2016-06-12 15:32:38.000000000 -0700
++++ config.guess	2016-06-29 05:21:01.000000000 -0700
+@@ -1261,7 +1261,7 @@
+ 	if test "$UNAME_PROCESSOR" = unknown ; then
+ 	    UNAME_PROCESSOR=powerpc
+ 	fi
+-	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
++	#if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+ 	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ 		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+@@ -1273,15 +1273,15 @@
+ 		    esac
+ 		fi
+ 	    fi
+-	elif test "$UNAME_PROCESSOR" = i386 ; then
++	#elif test "$UNAME_PROCESSOR" = i386 ; then
+ 	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+ 	    # that puts up a graphical alert prompting to install
+ 	    # developer tools.  Any system running Mac OS X 10.7 or
+ 	    # later (Darwin 11 and later) is required to have a 64-bit
+ 	    # processor. This is not true of the ARM version of Darwin
+ 	    # that Apple uses in portable devices.
+-	    UNAME_PROCESSOR=x86_64
+-	fi
++	    #UNAME_PROCESSOR=x86_64
++	#fi
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160629/7e478853/attachment.html>


More information about the macports-changes mailing list