[52324] trunk/base
toby at macports.org
toby at macports.org
Sun Jun 14 00:03:41 PDT 2009
Revision: 52324
http://trac.macports.org/changeset/52324
Author: toby at macports.org
Date: 2009-06-14 00:03:40 -0700 (Sun, 14 Jun 2009)
Log Message:
-----------
Merge universal-sanity branch. Changes are relatively straightforward, although somewhat risky:
- remove universal_sysroot/universal_target options
- hardcode the 10.4u SDK for Tiger/PPC, only platform that needs it
Modified Paths:
--------------
trunk/base/aclocal.m4
trunk/base/configure
trunk/base/doc/macports.conf.5
trunk/base/doc/macports.conf.in
trunk/base/src/macports1.0/macports.tcl
trunk/base/src/port1.0/portconfigure.tcl
trunk/base/src/port1.0/portmain.tcl
trunk/base/src/port1.0/portutil.tcl
Property Changed:
----------------
trunk/base/
Property changes on: trunk/base
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/gsoc08-privileges/base:37343-46937
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
+ /branches/gsoc08-privileges/base:37343-46937
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/aclocal.m4 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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: trunk/base/configure
===================================================================
--- trunk/base/configure 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/configure 2009-06-14 07:03:40 UTC (rev 52324)
@@ -676,8 +676,6 @@
READLINK_IS_NOT_P1003_1A
CPP
UNIVERSAL_ARCHS
-UNIVERSAL_SYSROOT
-UNIVERSAL_TARGET
MPFRAMEWORKSDIR
MPAPPLICATIONSDIR
DSTMODE
@@ -831,8 +829,6 @@
with_shared_directory
with_applications_dir
with_frameworks_dir
-with_universal_target
-with_universal_sysroot
with_universal_archs
enable_readline
with_tcl
@@ -1522,10 +1518,6 @@
--with-shared-directory Use 0775 permissions for installed directories
--with-applications-dir Applications installation directory.
--with-frameworks-dir Frameworks installation directory.
- --with-universal-target=MDT
- Universal MACOSX_DEPLOYMENT_TARGET version
- --with-universal-sysroot=SDK
- Universal SDK sysroot (with complete path)
--with-universal-archs="CPU"
Universal CPU architectures (space separated)
--with-tcl directory containing tcl configuration (tclConfig.sh)
@@ -8077,54 +8069,16 @@
-# Check whether --with-universal-target was given.
-if test "${with_universal_target+set}" = set; then
- withval=$with_universal_target; UNIVERSAL_TARGET=${withval}
-fi
-
-
-# Check whether --with-universal-sysroot was given.
-if test "${with_universal_sysroot+set}" = set; then
- withval=$with_universal_sysroot; UNIVERSAL_SYSROOT=${withval}
-fi
-
-
# Check whether --with-universal-archs was given.
if test "${with_universal_archs+set}" = set; then
withval=$with_universal_archs; UNIVERSAL_ARCHS=${withval}
fi
- 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
- { $as_echo "$as_me:$LINENO: checking for Universal MDT version" >&5
-$as_echo_n "checking for Universal MDT version... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $UNIVERSAL_TARGET" >&5
-$as_echo "$UNIVERSAL_TARGET" >&6; }
-
-
- { $as_echo "$as_me:$LINENO: checking for Universal SDK sysroot" >&5
-$as_echo_n "checking for Universal SDK sysroot... " >&6; }
- { $as_echo "$as_me:$LINENO: result: $UNIVERSAL_SYSROOT" >&5
-$as_echo "$UNIVERSAL_SYSROOT" >&6; }
-
-
{ $as_echo "$as_me:$LINENO: checking for Universal CPU architectures" >&5
$as_echo_n "checking for Universal CPU architectures... " >&6; }
{ $as_echo "$as_me:$LINENO: result: $UNIVERSAL_ARCHS" >&5
Modified: trunk/base/doc/macports.conf.5
===================================================================
--- trunk/base/doc/macports.conf.5 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/doc/macports.conf.5 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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: trunk/base/doc/macports.conf.in
===================================================================
--- trunk/base/doc/macports.conf.in 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/doc/macports.conf.in 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/src/macports1.0/macports.tcl 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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: trunk/base/src/port1.0/portconfigure.tcl
===================================================================
--- trunk/base/src/port1.0/portconfigure.tcl 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/src/port1.0/portconfigure.tcl 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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]}
@@ -196,34 +194,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: trunk/base/src/port1.0/portmain.tcl
===================================================================
--- trunk/base/src/port1.0/portmain.tcl 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/src/port1.0/portmain.tcl 2009-06-14 07:03:40 UTC (rev 52324)
@@ -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}
- }
}
# Record initial euid/egid
Modified: trunk/base/src/port1.0/portutil.tcl
===================================================================
--- trunk/base/src/port1.0/portutil.tcl 2009-06-14 05:53:56 UTC (rev 52323)
+++ trunk/base/src/port1.0/portutil.tcl 2009-06-14 07:03:40 UTC (rev 52324)
@@ -1883,12 +1883,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/20090614/730a1d46/attachment-0001.html>
More information about the macports-changes
mailing list