Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 66b8483

Browse files
jackjansenjackjansen
committed
Fixed two bugs in MacOSX framework handling spotted by Edward Moy:
- In the top level Makefile, the argument to -install_name should be prepended with /System/Library/Frameworks/, so it is an absolute path. - In the top level Makefile, because of 2), RUNSHARED needs to be set to DYLD_FRAMEWORK_PATH=<path to local framework> and $(RUNSHARED) prepended to the $(MAKE) lines in the frameworkinstallmaclib and frameworkinstallapps targets.
1 parent 276b290 commit 66b8483

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎Makefile.pre.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -858,14 +858,14 @@ frameworkinstallstructure: $(LDLIBRARY)
858858
# This installs Mac/Lib into the framework
859859
frameworkinstallmaclib:
860860
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
861-
BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
861+
$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
862862
srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
863863
DESTDIR=$(DESTDIR)
864864

865865
# This installs the IDE, the Launcher and other apps into /Applications
866866
frameworkinstallapps:
867867
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
868-
BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
868+
$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
869869
srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
870870

871871
# This install the unix python and pythonw tools in /usr/local/bin
@@ -878,7 +878,7 @@ frameworkinstallunixtools:
878878
# It is not part of a normal frameworkinstall
879879
frameworkinstallextras:
880880
$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installextras \
881-
BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
881+
$(RUNSHARED) BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
882882
srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
883883

884884
# This installs a few of the useful scripts in Tools/scripts

‎configure‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 1.419 .
2+
# From configure.in Revision: 1.420 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.53 for python 2.3.
55
#
@@ -3255,7 +3255,7 @@ echo $ECHO_N "checking LDLIBRARY... $ECHO_C" >&6
32553255
if test "$enable_framework"
32563256
then
32573257
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
3258-
LDLIBRARYDIR='$(PYTHONFRAMEWORKDIR)'
3258+
RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
32593259
BLDLIBRARY=''
32603260
else
32613261
BLDLIBRARY='$(LDLIBRARY)'
@@ -9466,12 +9466,12 @@ case $ac_sys_system/$ac_sys_release in
94669466
Darwin/1.3*)
94679467
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
94689468
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
9469-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
9469+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
94709470
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
94719471
Darwin/*)
94729472
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
94739473
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
9474-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
9474+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
94759475
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
94769476
esac
94779477

‎configure.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ AC_MSG_CHECKING(LDLIBRARY)
487487
if test "$enable_framework"
488488
then
489489
LDLIBRARY='$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
490-
LDLIBRARYDIR='$(PYTHONFRAMEWORKDIR)'
490+
RUNSHARED=DYLD_FRAMEWORK_PATH="`pwd`:$DYLD_FRAMEWORK_PATH"
491491
BLDLIBRARY=''
492492
else
493493
BLDLIBRARY='$(LDLIBRARY)'
@@ -1132,12 +1132,12 @@ case $ac_sys_system/$ac_sys_release in
11321132
Darwin/1.3*)
11331133
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
11341134
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
1135-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
1135+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
11361136
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
11371137
Darwin/*)
11381138
LIBTOOL_CRUFT="-lcc_dynamic -arch_only ppc"
11391139
LIBTOOL_CRUFT="$LIBTOOL_CRUFT $extra_frameworks"
1140-
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Python'
1140+
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python'
11411141
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
11421142
esac
11431143

0 commit comments

Comments
 (0)