From 6e5fd04ce21b421ff975c93611ff6c81547ce183 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Sat, 28 May 2011 05:59:55 -0700 Subject: [PATCH] Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, ensure "make install" creates symlinks in --prefix bin for the "-32" files in the framework bin directory like the installer does. --- Mac/Makefile.in | 13 +++++++++++++ Misc/NEWS | 6 ++++++ 2 files changed, 19 insertions(+) diff --git a/Mac/Makefile.in b/Mac/Makefile.in index 5e57b579427..8a62a9097c2 100644 --- a/Mac/Makefile.in +++ b/Mac/Makefile.in @@ -76,6 +76,13 @@ installunixtools: do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done +ifneq ($(LIPO_32BIT_FLAGS),) + for fn in python3-32 pythonw3-32 \ + python$(VERSION)-32 pythonw$(VERSION)-32 ;\ + do \ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ + done +endif # @@ -90,6 +97,12 @@ altinstallunixtools: do \ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ done +ifneq ($(LIPO_32BIT_FLAGS),) + for fn in python$(VERSION)-32 pythonw$(VERSION)-32 ;\ + do \ + ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ + done +endif pythonw: $(srcdir)/Tools/pythonw.c Makefile $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) diff --git a/Misc/NEWS b/Misc/NEWS index df6933af72e..49627210514 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -44,6 +44,12 @@ Library - Issue #12065: connect_ex() on an SSL socket now returns the original errno when the socket's timeout expires (it used to return None). +Build +----- + +- Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds, + ensure "make install" creates symlinks in --prefix bin for the "-32" + files in the framework bin directory like the installer does. What's New in Python 3.2.1 release candidate 1?