* macosx/tclMacOSXFCmd.c (TclMacOSXSetFileAttribute): on some versions

	of Mac OS X, truncate() fails on resource forks, in that case use
	open() with O_TRUNC instead.

	* macosx/tclMacOSXNotify.c: accommodate changes to prototypes of
	OSSpinLock(Un)Lock API.

	* macosx/Tcl.xcodeproj/project.pbxproj: ensure HOME and USER env vars
	* macosx/Tcl.xcodeproj/default.pbxuser: are defined when running
	                                        testsuite from Xcode.

	* tests/env.test: add extra system env vars that need to be preserved
	on some Mac OS X versions for testsuite to work.

	* unix/Makefile.in:  move libtommath defines into configure.in to avoid
	* unix/configure.in: replicating them across multiple buildsystems.
	* macosx/Tcl.xcodeproj/project.pbxproj:

	* unix/tcl.m4: ensure CPPFLAGS env var is used when set. [Bug 1586861]
	(Darwin): add -isysroot and -mmacosx-version-min flags to CPPFLAGS when
	present in CFLAGS to avoid discrepancies between what headers configure
	sees during preprocessing tests and compiling tests.

	* unix/configure: autoconf-2.59
	* unix/tclConfig.h.in: autoheader-2.59

2 files changed, 19 insertions, 10 deletions

diff --git a/macosx/Tcl.xcodeproj/default.pbxuser b/macosx/Tcl.xcodeproj/default.pbxuser
index 4a2e8aa..e425112 100644
--- a/macosx/Tcl.xcodeproj/default.pbxuser
+++ b/macosx/Tcl.xcodeproj/default.pbxuser
@@ -73,11 +73,26 @@
 				value = "${SRCROOT}/../../tcl/library";
 			},
 			{
-				active = NO;
+				active = YES;
 				name = TCLLIBPATH;
 				value = /Library/Tcl;
 			},
 			{
+				active = YES;
+				name = HOME;
+				value = "/Users/${USER}";
+			},
+			{
+				active = YES;
+				name = USER;
+				value = "${USER}";
+			},
+			{
+				active = YES;
+				name = MallocBadFreeAbort;
+				value = 1;
+			},
+			{
 				active = NO;
 				name = DYLD_PRINT_LIBRARIES;
 			},
@@ -90,6 +105,8 @@
 		};
 		sourceDirectories = (
 		);
+		variableFormatDictionary = {
+		};
 	};
 	F944EB9C08F798180049FDD4 /* Source Control */ = {
 		isa = PBXSourceControlManager;
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 14e3501..75ec251 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -1939,7 +1939,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.2\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\n# following test only fails when testsuite is run from inside Xcode, so skip it\nconfigure -skip [concat [configure -skip] stack-3.1]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
+			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.2\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\n# following test only fails when testsuite is run from inside Xcode, so skip it\nconfigure -skip [concat [configure -skip] stack-3.1]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
 		};
 		F9A5C5F508F651A2008AE941 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2175,8 +2175,6 @@
 				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tcl/tclConfig.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2281,8 +2279,6 @@
 				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tcl/tclConfig.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2331,8 +2327,6 @@
 				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tcl/tclConfig.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
@@ -2381,8 +2375,6 @@
 				GCC_PREFIX_HEADER = "${DERIVED_FILE_DIR}/tcl/tclConfig.h";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_TCL_CONFIG_H,
-					TCL_TOMMATH,
-					"MP_PREC=4",
 					"${GCC_PREPROCESSOR_DEFINITIONS}",
 				);
 				GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;