Merged revisions 79902 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79902 | ronald.oussoren | 2010-04-08 03:13:31 -0500 (Thu, 08 Apr 2010) | 9 lines

  This check-in fixes two problems:

  1) A non-critical off-by-one error in pythonw

  2) A problem in the configure script that caused
     builds with '--enable-framework --enable-universalsdk=/'
     to fail on OSX 10.6.
........

diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c
index 5fc59b574a8cc97494c8bdb6250ca5e11b907b44..1f3e0ce55f0dae9286faa7575ae395e5ecfc50fc 100644 (file)
--- a/Mac/Tools/pythonw.c
+++ b/Mac/Tools/pythonw.c
@@ -78,7 +78,7 @@ static char* get_python_path(void)
                end --;
        }
        end++;
-       if (end[1] == '.') {
+       if (*end == '.') {
                end++;
        }
        strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK);
@@ -161,7 +161,7 @@ main(int argc, char **argv) {
                setup_spawnattr(&spawnattr);            
                posix_spawn(NULL, exec_path, NULL,
                        &spawnattr, argv, environ);
-               err(1, "posix_spawn: %s", argv[0]);
+               err(1, "posix_spawn: %s", exec_path);
        }
 #endif
        execve(exec_path, argv, environ);

diff --git a/configure.in b/configure.in
index f240ee691eea40c47448f84dcf36c15cad44a8e8..0ec9dcff0e689fc3ef295e1c9908c50e90f5f9af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -915,36 +915,7 @@ yes)
                if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
                   ARCH_RUN_32BIT=""
-                  LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
-
-                   # You have to use different flags on various versions of
-                  # OSX to extract PPC code from an universal binary, basically
-                   # '-arch ppc' on OSX 10.4 and '-arch ppc7400' on anything                   
-                   # newer. 
-                   # Because '-arch pp7400' works on OSX 10.5 or higher this
-                   # test is only present in the '32-bit' branch, all other
-                   # branches require OSX 10.5 to compile.
-
-                  AC_MSG_CHECKING(lipo flag for extracting ppc code)
-                  FN="test.$$"
-                  cat >${FN}.c <<-EOF
-                       int main() { return 0; }
-EOF
-                  ${CC} ${CFLAGS} -arch ppc -arch i386 -o ${FN} ${FN}.c -isysroot ${UNIVERSALSDK}
-                  if test $? != 0 ; then
-                          rm ${FN} ${FN}.c
-                          AC_MSG_RESULT([failed, assumee -extract ppc7400])
-                  else
-                          lipo "${FN}" -extract ppc7400 -output "${FN}.out" 2>/dev/null
-                          if test $? != 0 ; then
-                              LIPO_32BIT_FLAGS="-extract ppc -extract i386"
-                              AC_MSG_RESULT("'-extract ppc'")
-                          else
-                              AC_MSG_RESULT("'-extract ppc7400'")
-                          fi
-                          rm -f ${FN} ${FN}.c ${FN}.out
-                  fi
-
+                  LIPO_32BIT_FLAGS=""
                 elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
                   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
                   LIPO_32BIT_FLAGS=""