[69161] trunk/dports/_resources/port1.0/group
jmr at macports.org
jmr at macports.org
Sat Jun 26 01:55:14 PDT 2010
Revision: 69161
http://trac.macports.org/changeset/69161
Author: jmr at macports.org
Date: 2010-06-26 01:55:14 -0700 (Sat, 26 Jun 2010)
Log Message:
-----------
remove 1.8 compat stuff from portgroups
Modified Paths:
--------------
trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
trunk/dports/_resources/port1.0/group/python26-1.0.tcl
trunk/dports/_resources/port1.0/group/python27-1.0.tcl
trunk/dports/_resources/port1.0/group/python31-1.0.tcl
trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl
trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -61,8 +61,6 @@
configure.universal_args-delete --disable-dependency-tracking
if {[info exists configure.sdkroot] && ${configure.sdkroot} != ""} {
configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
-} elseif {${os.arch} == "powerpc" && ${os.major} == "8"} {
- configure.universal_args-append -DCMAKE_OSX_SYSROOT="${developer_dir}/SDKs/MacOSX10.4u.sdk"
}
variant debug description "Enable debug binaries" {
Modified: trunk/dports/_resources/port1.0/group/python26-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python26-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/python26-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -46,8 +46,7 @@
depends_lib port:python26
-# we want the default universal variant added, so use a bad hack for 1.8
-set xcode.project ""
+# we want the default universal variant added despite not using configure
use_configure no
universal_variant yes
@@ -68,12 +67,8 @@
CXXFLAGS="${configure.cxx_archflags}" \
FFLAGS="${configure.f77_archflags}" \
F90FLAGS="${configure.f90_archflags}" \
- FCFLAGS="${configure.fc_archflags}"
- if {[info exists configure.ld_archflags]} {
- build.env-append LDFLAGS="${configure.ld_archflags}"
- } else {
- build.env-append LDFLAGS="${configure.cc_archflags}"
- }
+ FCFLAGS="${configure.fc_archflags}" \
+ LDFLAGS="${configure.ld_archflags}"
}
}
}
Modified: trunk/dports/_resources/port1.0/group/python27-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python27-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/python27-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -46,8 +46,7 @@
depends_lib port:python27
-# we want the default universal variant added, so use a bad hack for 1.8
-set xcode.project ""
+# we want the default universal variant added despite not using configure
use_configure no
universal_variant yes
@@ -68,12 +67,8 @@
CXXFLAGS="${configure.cxx_archflags}" \
FFLAGS="${configure.f77_archflags}" \
F90FLAGS="${configure.f90_archflags}" \
- FCFLAGS="${configure.fc_archflags}"
- if {[info exists configure.ld_archflags]} {
- build.env-append LDFLAGS="${configure.ld_archflags}"
- } else {
- build.env-append LDFLAGS="${configure.cc_archflags}"
- }
+ FCFLAGS="${configure.fc_archflags}" \
+ LDFLAGS="${configure.ld_archflags}"
}
}
}
Modified: trunk/dports/_resources/port1.0/group/python31-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/python31-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -46,8 +46,7 @@
depends_lib port:python31
-# we want the default universal variant added, so use a bad hack for 1.8
-set xcode.project ""
+# we want the default universal variant added despite not using configure
use_configure no
universal_variant yes
@@ -68,12 +67,8 @@
CXXFLAGS="${configure.cxx_archflags}" \
FFLAGS="${configure.f77_archflags}" \
F90FLAGS="${configure.f90_archflags}" \
- FCFLAGS="${configure.fc_archflags}"
- if {[info exists configure.ld_archflags]} {
- build.env-append LDFLAGS="${configure.ld_archflags}"
- } else {
- build.env-append LDFLAGS="${configure.cc_archflags}"
- }
+ FCFLAGS="${configure.fc_archflags}" \
+ LDFLAGS="${configure.ld_archflags}"
}
}
}
Modified: trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -14,11 +14,7 @@
depends_lib port:swig
-if {[info exists supported_archs]} {
- supported_archs noarch
-} else {
- universal_variant no
-}
+supported_archs noarch
# for use in post-destroot
options swig.lang
Modified: trunk/dports/_resources/port1.0/group/xcode-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2010-06-26 08:49:27 UTC (rev 69160)
+++ trunk/dports/_resources/port1.0/group/xcode-1.0.tcl 2010-06-26 08:55:14 UTC (rev 69161)
@@ -87,8 +87,7 @@
default platforms macosx
default use_configure no
default universal_variant yes
-# change build.type to 'xcode' when 1.9 is released
-default build.type pbx
+default build.type xcode
default build.args build
default build.pre_args {}
default build.target ""
@@ -263,16 +262,8 @@
}
# SDKROOT
- if {[info exists configure.sdkroot]} {
- append xcode_build_args " SDKROOT=\"${configure.sdkroot}\""
- } else {
- if {[variant_exists universal] && [variant_isset universal] && ${os.arch} == "powerpc" && ${os.major} == "8"} {
- append xcode_build_args " SDKROOT=\"${developer_dir}/SDKs/MacOSX10.4u.sdk\""
- } else {
- append xcode_build_args " SDKROOT="
- }
- }
-
+ append xcode_build_args " SDKROOT=\"${configure.sdkroot}\""
+
return $xcode_build_args
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100626/23c203c1/attachment.html>
More information about the macports-changes
mailing list