mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #11217: For 64-bit/32-bit Mac OS X universal framework builds,

Browse source 
ensure "make install" creates symlinks in --prefix bin for the "-32"
files in the framework bin directory like the installer does.
This commit is contained in:
Ned Deily 2011-05-28 06:04:02 -07:00
commit e4eed06dfa
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mac/Makefile.in
View file

@ -76,6 +76,13 @@ installunixtools:
do \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done 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 \ do \
ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\ ln -fs "$(prefix)/bin/$${fn}" "$(DESTDIR)$(FRAMEWORKUNIXTOOLSPREFIX)/bin/$${fn}" ;\
done 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 pythonw: $(srcdir)/Tools/pythonw.c Makefile
$(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK) $(CC) $(LDFLAGS) -DPYTHONFRAMEWORK='"$(PYTHONFRAMEWORK)"' -o $@ $(srcdir)/Tools/pythonw.c -I.. -I$(srcdir)/../Include ../$(PYTHONFRAMEWORK).framework/Versions/$(VERSION)/$(PYTHONFRAMEWORK)

4
Misc/NEWS
View file

@ -721,6 +721,10 @@ Library
Build 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.
- Issue #11347: Use --no-as-needed when linking libpython3.so. - Issue #11347: Use --no-as-needed when linking libpython3.so.
- Issue #11411: Fix 'make DESTDIR=' with a relative destination. - Issue #11411: Fix 'make DESTDIR=' with a relative destination.