Allow additional inserted libraries by keeping DYLD_INSERT_LIBRARIES variable.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@19020 d073be05-634f-4543-b044-5fe20cf6d1d6
This commit is contained in:
Paul Guyot
2006-08-05 14:03:34 +00:00
parent acc4ef9fc4
commit 3acb358d93
3 changed files with 16 additions and 7 deletions
+5 -2
View File
@@ -1,12 +1,12 @@
#
# $Id: ChangeLog,v 1.48 2006/08/05 01:04:24 jberry Exp $
# $Id: ChangeLog,v 1.49 2006/08/05 14:03:34 pguyot Exp $
#
# This is a log of major user-visible changes in each release
#
Release 1.? (unreleased):
- Fix a bug that prevented operation of port ed with some editors.
- Fixed a bug that prevented operation of port ed with some editors.
The env wasn't being properly restored for the editor. (jberry)
- Fixed a bug in the creation of the portf symlink. (jmpp)
@@ -35,6 +35,9 @@ Release 1.? (unreleased):
- Trace now forbids renaming files and directories as well as removing
directories outside the sandbox. (pguyot)
- Allow additional inserted libraries by keeping DYLD_INSERT_LIBRARIES
variable. (pguyot)
Release 1.3.1 (31-Jul-2006):
- Fixed a bug in livecheck sourceforge guess algorithm. (pguyot)
+3 -2
View File
@@ -1,5 +1,5 @@
# darwinports.tcl
# $Id: darwinports.tcl,v 1.218 2006/07/31 22:40:05 pguyot Exp $
# $Id: darwinports.tcl,v 1.219 2006/08/05 14:03:34 pguyot Exp $
#
# Copyright (c) 2002 Apple Computer, Inc.
# Copyright (c) 2004 - 2005 Paul Guyot, <pguyot@kallisys.net>.
@@ -427,7 +427,8 @@ proc dportinit {up_ui_options up_options up_variations} {
# ENV cleanup.
set keepenvkeys { DISPLAY DYLD_FALLBACK_FRAMEWORK_PATH
DYLD_FALLBACK_LIBRARY_PATH DYLD_FRAMEWORK_PATH
DYLD_LIBRARY_PATH HOME JAVA_HOME LD_PREBIND
DYLD_LIBRARY_PATH DYLD_INSERT_LIBRARIES
HOME JAVA_HOME LD_PREBIND
LD_PREBIND_ALLOW_OVERLAP MASTER_SITE_LOCAL
PATCH_SITE_LOCAL PATH PORTSRC RSYNC_PROXY TMP TMPDIR
USER GROUP
+8 -3
View File
@@ -1,7 +1,7 @@
# et:ts=4
# porttrace.tcl
#
# $Id: porttrace.tcl,v 1.22 2006/07/29 06:08:50 pguyot Exp $
# $Id: porttrace.tcl,v 1.23 2006/08/05 14:03:34 pguyot Exp $
#
# Copyright (c) 2005-2006 Paul Guyot <pguyot@kallisys.net>,
# All rights reserved.
@@ -52,8 +52,13 @@ proc trace_start {workpath} {
# Launch darwintrace.dylib.
set env(DYLD_INSERT_LIBRARIES) \
[file join ${portutil::autoconf::prefix} share darwinports Tcl darwintrace1.0 darwintrace.dylib]
set tracelib_path [file join ${portutil::autoconf::prefix} share darwinports Tcl darwintrace1.0 darwintrace.dylib]
if {[info exists env(DYLD_INSERT_LIBRARIES)]} {
set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}"
} else {
set env(DYLD_INSERT_LIBRARIES) ${tracelib_path}
}
set env(DYLD_FORCE_FLAT_NAMESPACE) 1
set env(DARWINTRACE_LOG) "$trace_fifo"
# The sandbox is limited to: