]> granicus.if.org Git - python/commitdiff
bpo-32726: Do not force IDLE.app to launch in 32-bit mode. (GH-6279) (#6281)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 28 Mar 2018 08:40:29 +0000 (01:40 -0700)
committerNed Deily <nad@python.org>
Wed, 28 Mar 2018 08:40:29 +0000 (04:40 -0400)
Forcing the macOS IDLE.app gui process to launch in 32-mode was
a necessary hack for old versions of Tk (Aqua Carbon as in Tk 8.4
and early versions of 8.5); it is not needed for current versions
of Tk.  Since 32-bit launching will no longer be supported on
future releases of macOS, allow IDLE.app to launch in 64-bit mode.
(cherry picked from commit df532ab752680f6e359672c2cd40bec8ac848628)

Co-authored-by: Ned Deily <nad@python.org>
Mac/Makefile.in

index 1255b13b42493e501025dd3b623b523ca5646c1e..95fd4a2722d51a84791b72c57a4a3e54632a575d 100644 (file)
@@ -221,10 +221,6 @@ install_IDLE:
        -test -d "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app" && rm -rf "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app"
        /bin/cp -PR "$(srcdir)/IDLE/IDLE.app" "$(DESTDIR)$(PYTHONAPPSDIR)"
        ln -sf "$(INSTALLED_PYTHONAPP)" "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
-ifneq ($(LIPO_32BIT_FLAGS),)
-       rm "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python"
-       lipo $(LIPO_32BIT_FLAGS) -output "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/Python" "$(BUILDPYTHON)"
-endif
        sed -e "s!%prefix%!$(prefix)!g" -e 's!%exe%!$(PYTHONFRAMEWORK)!g' < "$(srcdir)/IDLE/IDLE.app/Contents/MacOS/IDLE" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/MacOS/IDLE"
        sed "s!%version%!`$(RUNSHARED) $(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`!g" < "$(srcdir)/IDLE/IDLE.app/Contents/Info.plist" > "$(DESTDIR)$(PYTHONAPPSDIR)/IDLE.app/Contents/Info.plist"
        if [ -f "$(DESTDIR)$(LIBDEST)/idlelib/config-main.def" ]; then \