[52331] branches/images-and-archives/base
blb at macports.org
blb at macports.org
Sun Jun 14 01:33:35 PDT 2009
Revision: 52331
http://trac.macports.org/changeset/52331
Author: blb at macports.org
Date: 2009-06-14 01:33:27 -0700 (Sun, 14 Jun 2009)
Log Message:
-----------
Merge from trunk
Modified Paths:
--------------
branches/images-and-archives/base/aclocal.m4
branches/images-and-archives/base/configure
branches/images-and-archives/base/doc/macports.conf.5
branches/images-and-archives/base/doc/macports.conf.in
branches/images-and-archives/base/src/macports1.0/macports.tcl
branches/images-and-archives/base/src/pextlib1.0/tracelib.c
branches/images-and-archives/base/src/port1.0/portconfigure.tcl
branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
branches/images-and-archives/base/src/port1.0/portmain.tcl
branches/images-and-archives/base/src/port1.0/porttrace.tcl
branches/images-and-archives/base/src/port1.0/portutil.tcl
Property Changed:
----------------
branches/images-and-archives/base/
Property changes on: branches/images-and-archives/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
/trunk/base:50249-52202
/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
/trunk/base:50249-52330
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
Modified: branches/images-and-archives/base/aclocal.m4
===================================================================
--- branches/images-and-archives/base/aclocal.m4 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/aclocal.m4 2009-06-14 08:33:27 UTC (rev 52331)
@@ -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/images-and-archives/base/configure
===================================================================
--- branches/images-and-archives/base/configure 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/configure 2009-06-14 08:33:27 UTC (rev 52331)
@@ -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: branches/images-and-archives/base/doc/macports.conf.5
===================================================================
--- branches/images-and-archives/base/doc/macports.conf.5 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/doc/macports.conf.5 2009-06-14 08:33:27 UTC (rev 52331)
@@ -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/images-and-archives/base/doc/macports.conf.in
===================================================================
--- branches/images-and-archives/base/doc/macports.conf.in 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/doc/macports.conf.in 2009-06-14 08:33:27 UTC (rev 52331)
@@ -69,12 +69,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/images-and-archives/base/src/macports1.0/macports.tcl
===================================================================
--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -45,7 +45,7 @@
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 @@
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 \
os_arch os_endian os_major os_platform os_version"
# deferred options are only computed when needed.
@@ -351,8 +351,6 @@
global macports::configurepipe
global macports::buildnicevalue
global macports::buildmakejobs
- global macports::universal_target
- global macports::universal_sysroot
global macports::universal_archs
global macports::os_arch
global macports::os_endian
@@ -616,20 +614,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/images-and-archives/base/src/pextlib1.0/tracelib.c
===================================================================
--- branches/images-and-archives/base/src/pextlib1.0/tracelib.c 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/pextlib1.0/tracelib.c 2009-06-14 08:33:27 UTC (rev 52331)
@@ -82,6 +82,10 @@
}
name=strdup(Tcl_GetString(objv[2]));
+ if (!name) {
+ Tcl_SetResult(interp, "memory allocation failed", TCL_STATIC);
+ return TCL_ERROR;
+ }
return TCL_OK;
}
@@ -107,8 +111,12 @@
len=strlen(Tcl_GetString(objv[2]))+2;
sandbox=(char*)malloc(len);
+ if (!sandbox) {
+ Tcl_SetResult(interp, "memory allocation failed", TCL_STATIC);
+ return TCL_ERROR;
+ }
memset(sandbox, 0, len);
- strcpy(sandbox, Tcl_GetString(objv[2]));
+ strlcpy(sandbox, Tcl_GetString(objv[2]), len);
for(t=sandbox;(t=strchr(t+1, ':'));)
{
/* : -> \0 */
@@ -210,10 +218,23 @@
{
char * t, * _;
- filemap=(char*)malloc(1024);
+ size_t remaining = 1024;
+ filemap=(char*)malloc(remaining);
+ if (!filemap) {
+ ui_warn("send_file_map: memory allocation failed");
+ return;
+ }
t=filemap;
- #define append_allow(path, resolution) do{strcpy(t, path); t+=strlen(t)+1; *t++=resolution; *t++=0;}while(0);
+ #define append_allow(path, resolution) do { strlcpy(t, path, remaining); \
+ if (remaining < (strlen(t)+3)) \
+ remaining=0; \
+ else \
+ remaining-=strlen(t)+3; \
+ t+=strlen(t)+1; \
+ *t++=resolution; \
+ *t++=0; \
+ } while(0);
if(enable_fence)
{
for(_=sandbox; *_; _+=strlen(_)+1)
@@ -226,22 +247,25 @@
/* If there is no SDK we will allow everything in /usr /System/Library etc, else add binaries to allow, and redirect root to SDK. */
if(sdk&&*sdk)
{
- char buf[260]="/Developer/SDKs/";
- strcat(buf, sdk);
+ char buf[260];
+ buf[0] = '\0';
+ strlcat(buf, Tcl_GetVar(interp, "macports::developer_dir", TCL_GLOBAL_ONLY), 260);
+ strlcat(buf, "/SDKs/", 260);
+ strlcat(buf, sdk, 260);
append_allow("/usr/bin", 0);
append_allow("/usr/sbin", 0);
append_allow("/usr/libexec/gcc", 0);
append_allow("/System/Library/Perl", 0);
append_allow("/", 1);
- strcpy(t-1, buf);
+ strlcpy(t-1, buf, remaining);
t+=strlen(t)+1;
}else
{
append_allow("/usr", 0);
append_allow("/System/Library", 0);
append_allow("/Library", 0);
- append_allow("/Developer", 0);
+ append_allow(Tcl_GetVar(interp, "macports::developer_dir", TCL_GLOBAL_ONLY), 0);
}
}else
append_allow("/", 0);
@@ -267,42 +291,40 @@
{
char * port=0;
size_t len=1;
- char resolution;
+ char resolution='!';
+
+ Tcl_SetVar(interp, "path", path, 0);
+ Tcl_Eval(interp, "registry::file_registered $path");
+ port=strdup(Tcl_GetStringResult(interp));
+ if (!port) {
+ ui_warn("dep_check: memory allocation failed");
+ return;
+ }
+ Tcl_UnsetVar(interp, "path", 0);
- /* If there aren't deps then allow anything. (Useful for extract) */
- if(!depends)
- resolution='+';
- else
+ if(*port!='0'||port[1])
{
- resolution='!';
-
- Tcl_SetVar(interp, "path", path, 0);
- Tcl_Eval(interp, "registry::file_registered $path");
- port=strdup(Tcl_GetStringResult(interp));
- Tcl_UnsetVar(interp, "path", 0);
+ char * t;
- if(*port!='0'||port[1])
+ t=depends;
+ for(;*t;t+=strlen(t)+1)
{
- char * t;
-
- t=depends;
- for(;*t;t+=strlen(t)+1)
+ if(!strcmp(t, port))
{
- if(!strcmp(t, port))
- {
- resolution='+';
- break;
- }
+ resolution='+';
+ break;
}
- }else if(*port=='0'&&!port[1])
- strcpy(port, "*unknown*");
+ }
}
- if(resolution!='+')
- ui_info("trace: access denied to %s (%s)", path, port);
+ if(resolution!='+') {
+ if(*port=='0'&&!port[1])
+ ui_info("trace: access denied to %s (*unknown*)", path);
+ else
+ ui_info("trace: access denied to %s (%s)", path, port);
+ }
- if(port)
- free(port);
+ free(port);
if(send(sock, &len, sizeof(len), 0)==-1)
ui_warn("tracelib send failed");
@@ -374,7 +396,7 @@
sun.sun_family=AF_UNIX;
- strcpy(sun.sun_path, name);
+ strlcpy(sun.sun_path, name, sizeof(sun.sun_path));
if(bind(sock, (struct sockaddr*)&sun, sizeof(sun))==-1)
{
Tcl_SetResult(interp, "Cannot bind socket", TCL_STATIC);
@@ -518,8 +540,12 @@
d=Tcl_GetString(objv[2]);
l=strlen(d);
depends=malloc(l+2);
+ if (!depends) {
+ Tcl_SetResult(interp, "memory allocation failed", TCL_STATIC);
+ return TCL_ERROR;
+ }
depends[l+1]=0;
- strcpy(depends, d);
+ strlcpy(depends, d, l+2);
for(t=depends;*t;++t)
if(*t==' ')
*t++=0;
Modified: branches/images-and-archives/base/src/port1.0/portconfigure.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/port1.0/portconfigure.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -46,7 +46,7 @@
commands configure autoreconf automake autoconf xmkmf
# defaults
default configure.env ""
-default configure.pre_args {--prefix=${prefix}}
+default configure.pre_args {[portconfigure::configure_get_pre_args]}
default configure.cmd ./configure
default configure.dir {${worksrcpath}}
default autoreconf.dir {${worksrcpath}}
@@ -88,10 +88,10 @@
default configure.optflags {-O2}
# compiler flags section
default configure.cflags {[portconfigure::configure_get_cflags]}
-default configure.cppflags {"-I${prefix}/include"}
+default configure.cppflags {[portconfigure::configure_get_cppflags]}
default configure.cxxflags {[portconfigure::configure_get_cflags]}
default configure.objcflags {[portconfigure::configure_get_cflags]}
-default configure.ldflags {"-L${prefix}/lib"}
+default configure.ldflags {[portconfigure::configure_get_ldflags]}
default configure.libs {}
default configure.fflags {[portconfigure::configure_get_cflags]}
default configure.f90flags {[portconfigure::configure_get_cflags]}
@@ -102,6 +102,7 @@
proc portconfigure::configure_get_cflags {args} {
global configure.optflags
global configure.m32 configure.m64 configure.march configure.mtune
+ global configure.universal_cflags
set flags "${configure.optflags}"
if {[tbool configure.m64]} {
set flags "-m64 ${flags}"
@@ -114,9 +115,30 @@
if {[info exists configure.mtune] && ${configure.mtune} != {}} {
set flags "${flags} -mtune=${configure.mtune}"
}
+ if {[variant_isset universal] && ${configure.universal_cflags} != ""} {
+ set flags "${flags} ${configure.universal_cflags}"
+ }
return $flags
}
+proc portconfigure::configure_get_cppflags {args} {
+ global prefix configure.universal_cppflags
+ set flags "-I${prefix}/include"
+ if {[variant_isset universal] && ${configure.universal_cppflags} != ""} {
+ set flags "${flags} ${configure.universal_cppflags}"
+ }
+ return $flags
+}
+
+proc portconfigure::configure_get_ldflags {args} {
+ global prefix configure.universal_ldflags
+ set flags "-L${prefix}/lib"
+ if {[variant_isset universal] && ${configure.universal_ldflags} != ""} {
+ set flags "${flags} ${configure.universal_ldflags}"
+ }
+ return $flags
+}
+
# tools section
options configure.perl configure.python configure.ruby configure.install configure.awk configure.bison configure.pkg_config configure.pkg_config_path
default configure.perl {}
@@ -128,9 +150,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]}
@@ -184,46 +204,58 @@
ui_debug "Using compiler '$name'"
}
+proc portconfigure::configure_get_pre_args {args} {
+ global prefix configure.universal_args
+ set result "--prefix=${prefix}"
+ if {[variant_isset universal] && ${configure.universal_args} != ""} {
+ set result "$result ${configure.universal_args}"
+ }
+ return $result
+}
+
# internal function to determine the "-arch xy" flags for the compiler
proc portconfigure::configure_get_universal_archflags {args} {
global configure.universal_archs
set flags ""
foreach arch ${configure.universal_archs} {
- set flags "$flags -arch $arch"
+ if {$flags == ""} {
+ set flags "-arch $arch"
+ } else {
+ set flags "$flags -arch $arch"
+ }
}
return $flags
}
# 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
}
@@ -283,7 +315,6 @@
cc { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 }
objc { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-gcc-4.2 }
cxx { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-g++-4.2 }
- cpp { set ret ${developer_dir}/usr/llvm-gcc-4.2/bin/llvm-cpp-4.2 }
}
}
clang {
Modified: branches/images-and-archives/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/port1.0/portlivecheck.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -126,6 +126,10 @@
if {${livecheck.name} eq "default"} {
set livecheck.name $name
}
+ # If livecheck.distname is still "default", set it to $name.
+ if {${livecheck.distname} eq "default"} {
+ set livecheck.distname $name
+ }
if {[lsearch -exact [split $available_types "|"] ${livecheck.type}] != -1} {
# Load the defaults from _resources/port1.0/livecheck/${livecheck.type}.tcl.
set defaults_file "$types_dir/${livecheck.type}.tcl"
Modified: branches/images-and-archives/base/src/port1.0/portmain.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portmain.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/port1.0/portmain.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -114,11 +114,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: branches/images-and-archives/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/porttrace.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/port1.0/porttrace.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -44,7 +44,7 @@
if {[catch {package require Thread} error]} {
ui_warn "trace requires Tcl Thread package ($error)"
} else {
- global env trace_fifo trace_sandboxbounds portpath
+ global env trace_fifo trace_sandboxbounds portpath distpath
# Create a fifo.
# path in unix socket limited to 109 chars
# # set trace_fifo "$workpath/trace_fifo"
@@ -78,7 +78,7 @@
# /Library/Caches/com.apple.Xcode
# $CCACHE_DIR
# $HOMEDIR/.ccache
- set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:$portpath"
+ set trace_sandboxbounds "/tmp:/private/tmp:/var/tmp:/private/var/tmp:/dev/:/etc/passwd:/etc/groups:/etc/localtime:/Library/Caches/com.apple.Xcode:$env(HOME)/.ccache:${workpath}:${portpath}:${distpath}"
if {[info exists env(TMPDIR)]} {
set trace_sandboxbounds "${trace_sandboxbounds}:$env(TMPDIR)"
}
@@ -104,6 +104,7 @@
global env
if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] {
unset env(DARWINTRACE_SANDBOX_BOUNDS)
+ unsetenv DARWINTRACE_SANDBOX_BOUNDS
}
}
@@ -147,11 +148,9 @@
global os.platform
if {${os.platform} == "darwin"} {
global env trace_fifo
- unset env(DYLD_INSERT_LIBRARIES)
- unset env(DYLD_FORCE_FLAT_NAMESPACE)
- unset env(DARWINTRACE_LOG)
- if [info exists env(DARWINTRACE_SANDBOX_BOUNDS)] {
- unset env(DARWINTRACE_SANDBOX_BOUNDS)
+ foreach var {DYLD_INSERT_LIBRARIES DYLD_FORCE_FLAT_NAMESPACE DARWINTRACE_LOG DARWINTRACE_SANDBOX_BOUNDS} {
+ array unset env $var
+ unsetenv $var
}
#kill socket
Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl
===================================================================
--- branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-06-14 07:57:52 UTC (rev 52330)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-06-14 08:33:27 UTC (rev 52331)
@@ -1267,7 +1267,6 @@
# Enable the fence to prevent any creation/modification
# outside the sandbox.
if {$target != "activate"
- && $target != "fetch"
&& $target != "imagefile"
&& $target != "install"} {
porttrace::trace_enable_fence
@@ -1884,17 +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}
- eval configure.cxxflags-append ${configure.universal_cxxflags}
- eval configure.ldflags-append ${configure.universal_ldflags}
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090614/37d7926c/attachment-0001.html>
More information about the macports-changes
mailing list