[51875] branches/universal-sanity/base
toby at macports.org
toby at macports.org
Fri Jun 5 14:41:12 PDT 2009
Revision: 51875
http://trac.macports.org/changeset/51875
Author: toby at macports.org
Date: 2009-06-05 14:41:12 -0700 (Fri, 05 Jun 2009)
Log Message:
-----------
Universal build cleanup. Basic summary:
- remove universal_sdkroot/universal_target options
- hardcode sdkroot on Tiger/PPC - only platform that needs it
We should probably add another way to globally set SDKROOT/MACOSX_DEPLOYMENT_TARGET, but +universal is not the way to go.
Modified Paths:
--------------
branches/universal-sanity/base/aclocal.m4
branches/universal-sanity/base/doc/macports.conf.5
branches/universal-sanity/base/doc/macports.conf.in
branches/universal-sanity/base/src/macports1.0/macports.tcl
branches/universal-sanity/base/src/port1.0/portconfigure.tcl
branches/universal-sanity/base/src/port1.0/portmain.tcl
branches/universal-sanity/base/src/port1.0/portutil.tcl
Modified: branches/universal-sanity/base/aclocal.m4
===================================================================
--- branches/universal-sanity/base/aclocal.m4 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/aclocal.m4 2009-06-05 21:41:12 UTC (rev 51875)
@@ -490,36 +490,12 @@
#---------------------------------------
AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
- AC_ARG_WITH(universal-target,[AS_HELP_STRING([--with-universal-target=MDT],[Universal MACOSX_DEPLOYMENT_TARGET version])], UNIVERSAL_TARGET=${withval})
- AC_ARG_WITH(universal-sysroot,[AS_HELP_STRING([--with-universal-sysroot=SDK],[Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
- MACOSX_MAJOR_VERSION=`$SW_VERS -productVersion | cut -f-2 -d.`
-
- if test "x$UNIVERSAL_TARGET" = "x"; then
- UNIVERSAL_TARGET=${MACOSX_MAJOR_VERSION}
- fi
-
- if test "x$UNIVERSAL_SYSROOT" = "x"; then
- if test "${MACOSX_MAJOR_VERSION}" = "10.4"; then
- UNIVERSAL_SYSROOT=${DEVELOPER_DIR}/SDKs/MacOSX${MACOSX_MAJOR_VERSION}u.sdk
- else
- UNIVERSAL_SYSROOT=${DEVELOPER_DIR}/SDKs/MacOSX${MACOSX_MAJOR_VERSION}.sdk
- fi
- fi
-
if test "x$UNIVERSAL_ARCHS" = "x"; then
UNIVERSAL_ARCHS="ppc i386"
fi
-
- AC_MSG_CHECKING([for Universal MDT version])
- AC_MSG_RESULT([$UNIVERSAL_TARGET])
- AC_SUBST(UNIVERSAL_TARGET)
- AC_MSG_CHECKING([for Universal SDK sysroot])
- AC_MSG_RESULT([$UNIVERSAL_SYSROOT])
- AC_SUBST(UNIVERSAL_SYSROOT)
-
AC_MSG_CHECKING([for Universal CPU architectures])
AC_MSG_RESULT([$UNIVERSAL_ARCHS])
AC_SUBST(UNIVERSAL_ARCHS)
Modified: branches/universal-sanity/base/doc/macports.conf.5
===================================================================
--- branches/universal-sanity/base/doc/macports.conf.5 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/doc/macports.conf.5 2009-06-05 21:41:12 UTC (rev 51875)
@@ -161,16 +161,6 @@
.br
.Ic Default:
yes
-.It Va universal_target
-The MACOSX_DEPLOYMENT_TARGET to use for +universal variant
-.br
-.Ic Example:
-10.4
-.It Va universal_sysroot
-The SDK "sysroot" full path to use for +universal variant
-.br
-.Ic Example:
-/Developer/SDKs/MacOSX10.4u.sdk
.It Va universal_archs
The machine architectures to use for +universal variant
(multiple architecture entries should be space separated)
Modified: branches/universal-sanity/base/doc/macports.conf.in
===================================================================
--- branches/universal-sanity/base/doc/macports.conf.in 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/doc/macports.conf.in 2009-06-05 21:41:12 UTC (rev 51875)
@@ -89,12 +89,6 @@
# Options for Universal Binaries (+universal variant)
-# MACOSX_DEPLOYMENT_TARGET
-universal_target @UNIVERSAL_TARGET@
-
-# the SDK "sysroot" to use
-universal_sysroot @UNIVERSAL_SYSROOT@
-
# machine architectures
universal_archs @UNIVERSAL_ARCHS@
Modified: branches/universal-sanity/base/src/macports1.0/macports.tcl
===================================================================
--- branches/universal-sanity/base/src/macports1.0/macports.tcl 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/src/macports1.0/macports.tcl 2009-06-05 21:41:12 UTC (rev 51875)
@@ -45,7 +45,7 @@
porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
- applications_dir frameworks_dir developer_dir universal_target universal_sysroot universal_archs \
+ applications_dir frameworks_dir developer_dir universal_archs \
macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip"
variable user_options "submitter_name submitter_email submitter_key"
variable portinterp_options "\
@@ -54,7 +54,7 @@
portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
rsync_options rsync_dir startupitem_type place_worksymlink \
mp_remote_url mp_remote_submit_url configureccache configuredistcc configurepipe buildnicevalue buildmakejobs \
- applications_dir frameworks_dir developer_dir universal_target universal_sysroot universal_archs $user_options"
+ applications_dir frameworks_dir developer_dir universal_archs $user_options"
# deferred options are only computed when needed.
# they are not exported to the trace thread.
@@ -350,8 +350,6 @@
global macports::configurepipe
global macports::buildnicevalue
global macports::buildmakejobs
- global macports::universal_target
- global macports::universal_sysroot
global macports::universal_archs
# Set the system encoding to utf-8
@@ -651,20 +649,6 @@
}
# Default mp universal options
- if {![info exists macports::universal_target]} {
- if {[file exists ${macports::developer_dir}/SDKs/MacOSX10.5.sdk]} {
- set macports::universal_target "10.5"
- } else {
- set macports::universal_target "10.4"
- }
- }
- if {![info exists macports::universal_sysroot]} {
- if {[file exists ${macports::developer_dir}/SDKs/MacOSX10.5.sdk]} {
- set macports::universal_sysroot "${macports::developer_dir}/SDKs/MacOSX10.5.sdk"
- } else {
- set macports::universal_sysroot "${macports::developer_dir}/SDKs/MacOSX10.4u.sdk"
- }
- }
if {![info exists macports::universal_archs]} {
set macports::universal_archs {ppc i386}
}
Modified: branches/universal-sanity/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/universal-sanity/base/src/port1.0/portconfigure.tcl 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/src/port1.0/portconfigure.tcl 2009-06-05 21:41:12 UTC (rev 51875)
@@ -128,9 +128,7 @@
default configure.pkg_config {}
default configure.pkg_config_path {}
-options configure.universal_target configure.universal_sysroot configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
-default configure.universal_target {${universal_target}}
-default configure.universal_sysroot {${universal_sysroot}}
+options configure.universal_archs configure.universal_args configure.universal_cflags configure.universal_cppflags configure.universal_cxxflags configure.universal_ldflags
default configure.universal_archs {${universal_archs}}
default configure.universal_args {--disable-dependency-tracking}
default configure.universal_cflags {[portconfigure::configure_get_universal_cflags]}
@@ -203,34 +201,33 @@
# internal function to determine the CPPFLAGS for the compiler
proc portconfigure::configure_get_universal_cppflags {args} {
- global configure.universal_sysroot
+ global os.arch os.major
set flags ""
# include sysroot in CPPFLAGS too (twice), for the benefit of autoconf
- if {[info exists configure.universal_sysroot]} {
- set flags "-isysroot ${configure.universal_sysroot}"
+ if {${os.arch} == "powerpc" && ${os.major} == "8"} {
+ set flags "-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
}
return $flags
}
# internal function to determine the CFLAGS for the compiler
proc portconfigure::configure_get_universal_cflags {args} {
- global configure.universal_sysroot configure.universal_target
+ global os.arch os.major
set flags [configure_get_universal_archflags]
# these flags should be valid for C/C++ and similar compiler frontends
- if {[info exists configure.universal_sysroot]} {
- set flags "-isysroot ${configure.universal_sysroot} ${flags}"
+ if {${os.arch} == "powerpc" && ${os.major} == "8"} {
+ set flags "-isysroot /Developer/SDKs/MacOSX10.4u.sdk ${flags}"
}
return $flags
}
# internal function to determine the LDFLAGS for the compiler
proc portconfigure::configure_get_universal_ldflags {args} {
- global configure.universal_sysroot configure.universal_target
- global os.arch
+ global os.arch os.major
set flags [configure_get_universal_archflags]
# works around linking without using the CFLAGS, outside of automake
- if {${os.arch} == "powerpc"} {
- set flags "-Wl,-syslibroot,${configure.universal_sysroot} ${flags}"
+ if {${os.arch} == "powerpc" && ${os.major} == "8"} {
+ set flags "-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk ${flags}"
}
return $flags
}
Modified: branches/universal-sanity/base/src/port1.0/portmain.tcl
===================================================================
--- branches/universal-sanity/base/src/port1.0/portmain.tcl 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/src/port1.0/portmain.tcl 2009-06-05 21:41:12 UTC (rev 51875)
@@ -122,11 +122,6 @@
# the universal variant itself is now created in
# add_default_universal_variant, which is called from mportopen
option os.universal_supported yes
-
- if {[info exists variations(universal)] && $variations(universal) == "+"} {
- # cannot go into the variant, due to the amount of ports overriding it
- eval macosx_deployment_target ${universal_target}
- }
}
proc portmain::main {args} {
Modified: branches/universal-sanity/base/src/port1.0/portutil.tcl
===================================================================
--- branches/universal-sanity/base/src/port1.0/portutil.tcl 2009-06-05 21:41:09 UTC (rev 51874)
+++ branches/universal-sanity/base/src/port1.0/portutil.tcl 2009-06-05 21:41:12 UTC (rev 51875)
@@ -1893,12 +1893,6 @@
proc add_default_universal_variant {args} {
# Declare default universal variant if universal SDK is installed
variant universal {
- pre-fetch {
- if {![file exists ${configure.universal_sysroot}]} {
- return -code error "Universal SDK is not installed (are we running on 10.3? did you forget to install it?) and building with +universal will very likely fail"
- }
- }
-
eval configure.args-append ${configure.universal_args}
eval configure.cflags-append ${configure.universal_cflags}
eval configure.cppflags-append ${configure.universal_cppflags}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090605/eff5f1b9/attachment.html>
More information about the macports-changes
mailing list