traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added a define EXTRAMACHDEPPATH which can be used to add sys.path items 

for specific platforms. Use this to add plat-mac and
plat-mac/lib-scriptpackages on MacOSX. Also tested for not having adverse
effects on Linux, and I think this code isn't used on Windows anyway.

Fixes #661521.
This commit is contained in:
Jack Jansen 2003-03-17 15:44:10 +00:00
parent dcf6d2c97d
commit 7b59b42a38
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.pre.in
View File

@ -612,6 +612,7 @@ maninstall:
# Install the library # Install the library
PLATDIR= plat-$(MACHDEP) PLATDIR= plat-$(MACHDEP)
EXTRAPLATDIR= @EXTRAPLATDIR@ EXTRAPLATDIR= @EXTRAPLATDIR@
EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR)
XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax XMLLIBSUBDIRS= xml xml/dom xml/parsers xml/sax
PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
@ -622,6 +623,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
plat-mac/lib-scriptpackages/Netscape \ plat-mac/lib-scriptpackages/Netscape \
plat-mac/lib-scriptpackages/StdSuites \ plat-mac/lib-scriptpackages/StdSuites \
plat-mac/lib-scriptpackages/Terminal plat-mac/lib-scriptpackages/Terminal
PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
LIBSUBDIRS= lib-old lib-tk site-packages test test/output test/data \ LIBSUBDIRS= lib-old lib-tk site-packages test test/output test/data \
encodings email email/test email/test/data compiler hotshot \ encodings email email/test email/test/data compiler hotshot \
logging bsddb bsddb/test \ logging bsddb bsddb/test \

3
Modules/Setup.dist
View File

@ -92,12 +92,13 @@ TESTPATH=
# Path components for machine- or system-dependent modules and shared libraries # Path components for machine- or system-dependent modules and shared libraries
MACHDEPPATH=:plat-$(MACHDEP) MACHDEPPATH=:plat-$(MACHDEP)
EXTRAMACHDEPPATH=
# Path component for the Tkinter-related modules # Path component for the Tkinter-related modules
# The TKPATH variable is always enabled, to save you the effort. # The TKPATH variable is always enabled, to save you the effort.
TKPATH=:lib-tk TKPATH=:lib-tk
COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH) COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)
PYTHONPATH=$(COREPYTHONPATH) PYTHONPATH=$(COREPYTHONPATH)

14
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.392 . # From configure.in Revision: 1.393 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3. # Generated by GNU Autoconf 2.53 for python 2.3.
# #
@ -1390,13 +1390,20 @@ echo "${ECHO_T}$MACHDEP" >&6
# And add extra plat-mac for darwin # And add extra plat-mac for darwin
echo "$as_me:$LINENO: checking EXTRAPLATDIR" >&5 echo "$as_me:$LINENO: checking EXTRAPLATDIR" >&5
echo $ECHO_N "checking EXTRAPLATDIR... $ECHO_C" >&6 echo $ECHO_N "checking EXTRAPLATDIR... $ECHO_C" >&6
if test -z "$EXTRAPLATDIR" if test -z "$EXTRAPLATDIR"
then then
case $MACHDEP in case $MACHDEP in
darwin) EXTRAPLATDIR="\$(PLATMACDIRS)";; darwin)
*) EXTRAPLATDIR="";; EXTRAPLATDIR="\$(PLATMACDIRS)"
EXTRAMACHDEPPATH="\$(PLATMACPATH)"
;;
*)
EXTRAPLATDIR=""
EXTRAMACHDEPPATH=""
;;
esac esac
fi fi
echo "$as_me:$LINENO: result: $EXTRAPLATDIR" >&5 echo "$as_me:$LINENO: result: $EXTRAPLATDIR" >&5
@ -17468,6 +17475,7 @@ s,@PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
s,@MACHDEP@,$MACHDEP,;t t s,@MACHDEP@,$MACHDEP,;t t
s,@SGI_ABI@,$SGI_ABI,;t t s,@SGI_ABI@,$SGI_ABI,;t t
s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
s,@EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
s,@CXX@,$CXX,;t t s,@CXX@,$CXX,;t t
s,@MAINOBJ@,$MAINOBJ,;t t s,@MAINOBJ@,$MAINOBJ,;t t
s,@EXEEXT@,$EXEEXT,;t t s,@EXEEXT@,$EXEEXT,;t t

11
configure.in
View File

@ -157,12 +157,19 @@ AC_MSG_RESULT($MACHDEP)
# And add extra plat-mac for darwin # And add extra plat-mac for darwin
AC_SUBST(EXTRAPLATDIR) AC_SUBST(EXTRAPLATDIR)
AC_SUBST(EXTRAMACHDEPPATH)
AC_MSG_CHECKING(EXTRAPLATDIR) AC_MSG_CHECKING(EXTRAPLATDIR)
if test -z "$EXTRAPLATDIR" if test -z "$EXTRAPLATDIR"
then then
case $MACHDEP in case $MACHDEP in
darwin) EXTRAPLATDIR="\$(PLATMACDIRS)";; darwin)
*) EXTRAPLATDIR="";; EXTRAPLATDIR="\$(PLATMACDIRS)"
EXTRAMACHDEPPATH="\$(PLATMACPATH)"
;;
*)
EXTRAPLATDIR=""
EXTRAMACHDEPPATH=""
;;
esac esac
fi fi
AC_MSG_RESULT($EXTRAPLATDIR) AC_MSG_RESULT($EXTRAPLATDIR)