[92035] trunk/dports/devel/liboil
jeremyhu at macports.org
jeremyhu at macports.org
Mon Apr 16 09:08:28 PDT 2012
Revision: 92035
https://trac.macports.org/changeset/92035
Author: jeremyhu at macports.org
Date: 2012-04-16 09:08:27 -0700 (Mon, 16 Apr 2012)
Log Message:
-----------
liboil: +universal support, #33670
Modified Paths:
--------------
trunk/dports/devel/liboil/Portfile
Removed Paths:
-------------
trunk/dports/devel/liboil/files/host_cpu.diff
Modified: trunk/dports/devel/liboil/Portfile
===================================================================
--- trunk/dports/devel/liboil/Portfile 2012-04-16 15:48:34 UTC (rev 92034)
+++ trunk/dports/devel/liboil/Portfile 2012-04-16 16:08:27 UTC (rev 92035)
@@ -2,12 +2,11 @@
PortSystem 1.0
-# -universal because of SnowLeopard host_cpu issue (see below)
-#PortGroup muniversal 1.0
-universal_variant no
+PortGroup muniversal 1.0
name liboil
version 0.3.17
+revision 1
description A library of simple functions that are optimized for various CPUs.
long_description ${description}
maintainers landonf
@@ -30,36 +29,20 @@
configure.args-append --enable-gtk-doc
}
-# Building muniversal, configure fails to figure this out
-#configure.cppflags-append -DHAVE_SYMBOL_UNDERSCORE
+use_autoreconf yes
+autoreconf.args -fvi
-#post-configure {
-# # muniversal mucks up our glibtool
-# foreach arch ${universal_archs_to_use} {
-# copy -force ${prefix}/bin/glibtool ${worksrcpath}-${arch}/libtool
-# }
-#}
+if {[variant_isset universal]} {
+ set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
+} elseif {${build_arch} == "x86_64"} {
+ configure.args-append \
+ --host=${build_arch}-apple-${os.platform}${os.major}
+}
livecheck.type regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex ${name}-(\\d(?:\\.\\d+)*)
-platform darwin 10 {
- # NB: won't work for universal building, but this port doesn't support it yet
- patchfiles-append host_cpu.diff
- post-patch {
- reinplace "s|__HOST_CPU__|${build_arch}|" ${worksrcpath}/configure
- }
-}
-
-platform darwin 11 {
- # NB: won't work for universal building, but this port doesn't support it yet
- patchfiles-append host_cpu.diff
- post-patch {
- reinplace "s|__HOST_CPU__|${build_arch}|" ${worksrcpath}/configure
- }
-}
-
# icky inline asm... clang doesn't want to touch it, but we can force it
if {${configure.compiler} == "clang"} {
configure.cflags-append -fheinous-gnu-extensions
Deleted: trunk/dports/devel/liboil/files/host_cpu.diff
===================================================================
--- trunk/dports/devel/liboil/files/host_cpu.diff 2012-04-16 15:48:34 UTC (rev 92034)
+++ trunk/dports/devel/liboil/files/host_cpu.diff 2012-04-16 16:08:27 UTC (rev 92035)
@@ -1,11 +0,0 @@
---- configure.orig 2009-07-01 12:38:34.000000000 -0700
-+++ configure 2009-07-01 12:38:40.000000000 -0700
-@@ -2130,7 +2130,7 @@
- ac_save_IFS=$IFS; IFS='-'
- set x $ac_cv_host
- shift
--host_cpu=$1
-+host_cpu=__HOST_CPU__
- host_vendor=$2
- shift; shift
- # Remember, the first character of IFS is used to create $*,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120416/d1a789e8/attachment.html>
More information about the macports-changes
mailing list