[darwinbuild-changes] [981] trunk

[source_changes at macosforge.org]

Revision: 981
          http://trac.macosforge.org/projects/darwinbuild/changeset/981
Author:   kvv at apple.com
Date:     2011-11-11 14:46:28 -0800 (Fri, 11 Nov 2011)
Log Message:
-----------
- darwintrace: darwintrace_make_environ bug unsets DYLD_INSERT_LIBRARIES

Modified Paths:
--------------
    trunk/CHANGES
    trunk/darwintrace/darwintrace.c

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/PR-10363375:959-960
/branches/PR-10397485:967
/branches/PR-10412052:973-975
/branches/PR-10412066:974-975
/branches/PR-4841388:399-419
/branches/PR-6358021:442-443
/branches/PR-6392966:423-427
/branches/PR-6398060:433-434
/branches/PR-6493844:460-461
/branches/PR-6497694:466-468,471
/branches/PR-6634286:632-650
/branches/PR-6688645:479-490
/branches/PR-6722857:495-499
/branches/PR-6729491:655-664
/branches/PR-6973110:804-813
/branches/PR-7250612:635-650
/branches/PR-7341154:682-694
/branches/PR-7431723:660-664
/branches/PR-7461534:650-664
/branches/PR-7482850:670-671
/branches/PR-7489777:676-731
/branches/PR-7529688:692-694
/branches/PR-7593824:739-772
/branches/PR-7598640:703-731
/branches/PR-7748469:777-785
/branches/PR-7765119:790-791
/branches/PR-7798586:796-799
/branches/PR-7872907:830-840
/branches/PR-7935095:819-821
/branches/PR-8116613:849
/branches/PR-8279204:854-862
/branches/PR-8416637:870-880
/branches/PR-8486662:885-889
/branches/PR-8488185:894-898
/branches/PR-8604911:903-905
/branches/PR-8817822:917-933
/branches/PR-8908468:912
   + /branches/PR-10363375:959-960
/branches/PR-10397485:967
/branches/PR-10412052:973-975
/branches/PR-10412066:974-975
/branches/PR-10431324:979-980
/branches/PR-4841388:399-419
/branches/PR-6358021:442-443
/branches/PR-6392966:423-427
/branches/PR-6398060:433-434
/branches/PR-6493844:460-461
/branches/PR-6497694:466-468,471
/branches/PR-6634286:632-650
/branches/PR-6688645:479-490
/branches/PR-6722857:495-499
/branches/PR-6729491:655-664
/branches/PR-6973110:804-813
/branches/PR-7250612:635-650
/branches/PR-7341154:682-694
/branches/PR-7431723:660-664
/branches/PR-7461534:650-664
/branches/PR-7482850:670-671
/branches/PR-7489777:676-731
/branches/PR-7529688:692-694
/branches/PR-7593824:739-772
/branches/PR-7598640:703-731
/branches/PR-7748469:777-785
/branches/PR-7765119:790-791
/branches/PR-7798586:796-799
/branches/PR-7872907:830-840
/branches/PR-7935095:819-821
/branches/PR-8116613:849
/branches/PR-8279204:854-862
/branches/PR-8416637:870-880
/branches/PR-8486662:885-889
/branches/PR-8488185:894-898
/branches/PR-8604911:903-905
/branches/PR-8817822:917-933
/branches/PR-8908468:912

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2011-11-11 18:24:07 UTC (rev 980)
+++ trunk/CHANGES	2011-11-11 22:46:28 UTC (rev 981)
@@ -1,5 +1,8 @@
 Darwin Build Scripts Change History
 -----------------------------------
+Release 26.3 [11-Nov-2011]
+	- darwintrace: darwintrace_make_environ bug unsets DYLD_INSERT_LIBRARIES
+
 Release 26.2 [9-Nov-2011]
 	- darwintrace: build failure on 10.6, undefined symbol __posix_spawn
 	- darwintrace: crash in darwintrace_make_environ

Modified: trunk/darwintrace/darwintrace.c
===================================================================
--- trunk/darwintrace/darwintrace.c	2011-11-11 18:24:07 UTC (rev 980)
+++ trunk/darwintrace/darwintrace.c	2011-11-11 22:46:28 UTC (rev 981)
@@ -409,7 +409,8 @@
         if (darwintrace_dylib_path) {
             if (libs && strstr(libs, darwintrace_dylib_path)) {
                 /* inserted libraries already contain dylib */
-                result[i] = strdup(DARWINTRACE_PLACEHOLDER);
+                asprintf(&result[i], "%s%s",
+                        DYLD_INSERT_LIBRARIES, libs);
             } else {
                 /* otherwise set or insert the dylib path */
                 asprintf(&result[i], "%s%s%s%s",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20111111/4c7ec16b/attachment-0001.html>