diff --git a/Include/pythonrun.h b/Include/pythonrun.h index cfb02b0..20aaa3b 100644 --- a/Include/pythonrun.h +++ b/Include/pythonrun.h @@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); +PyAPI_FUNC(const char *) Py_GetArch(void); +PyAPI_FUNC(const char *) Py_GetLib(void); PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index b9f1c6c..0462776 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -21,6 +21,7 @@ from distutils.errors import DistutilsOptionError from site import USER_BASE from site import USER_SITE +libname = sys.lib if sys.version < "2.2": WINDOWS_SCHEME = { @@ -42,14 +43,14 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', }, 'unix_home': { 'purelib': '$base/lib/python', - 'platlib': '$base/lib/python', + 'platlib': '$base/'+libname+'/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index de7da1d..0a8b93e 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -119,8 +119,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": + if plat_specific: + lib = sys.lib + else: + lib = 'lib' libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + lib, "python" + get_python_version()) if standard_lib: return libpython else: @@ -230,7 +234,8 @@ def get_config_h_filename(): else: inc_dir = project_base else: - inc_dir = get_python_inc(plat_specific=1) + prefix = EXEC_PREFIX or PREFIX + inc_dir = os.path.join(prefix, "include", "multiarch-" + sys.arch + "-linux", "python" + sys.version[:3]) if get_python_version() < '2.2': config_h = 'config.h' else: diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py index c3492b8..b25979f 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -58,8 +58,9 @@ class InstallTestCase(support.TempdirManager, self.assertEqual(got, expected) libdir = os.path.join(destination, "lib", "python") + platlibdir = os.path.join(destination, sys.lib, "python") check_path(cmd.install_lib, libdir) - check_path(cmd.install_platlib, libdir) + check_path(cmd.install_platlib, platlibdir) check_path(cmd.install_purelib, libdir) check_path(cmd.install_headers, os.path.join(destination, "include", "python", "foopkg")) diff --git a/Lib/site.py b/Lib/site.py index 3b51e81..4074a21 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -288,13 +288,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, sys.lib, "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) + if sys.lib != 'lib': + sitepackages.append(os.path.join(prefix, 'lib', + "python" + sys.version[:3], + "site-packages")) + sitepackages.append(os.path.join(prefix, 'lib', "site-python")) else: sitepackages.append(prefix) - sitepackages.append(os.path.join(prefix, "lib", "site-packages")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-packages")) return sitepackages def addsitepackages(known_paths): diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 2a1da5a..13347fb 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -7,20 +7,20 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', + 'stdlib': '{base}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{platbase}/'+sys.lib+'/python{py_version_short}', 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{platbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', 'scripts': '{base}/bin', 'data': '{base}', }, 'posix_home': { - 'stdlib': '{base}/lib/python', - 'platstdlib': '{base}/lib/python', + 'stdlib': '{base}/'+sys.lib+'/python', + 'platstdlib': '{base}/'+sys.lib+'/python', 'purelib': '{base}/lib/python', - 'platlib': '{base}/lib/python', + 'platlib': '{base}/'+sys.lib+'/python', 'include': '{base}/include/python', 'platinclude': '{base}/include/python', 'scripts': '{base}/bin', @@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { 'data' : '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', + 'stdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', + 'platstdlib': '{userbase}/'+sys.lib+'/python{py_version_short}', 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{userbase}/'+sys.lib+'/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', diff --git a/Makefile.pre.in b/Makefile.pre.in index e288964..9af9d75 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -91,6 +91,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ +ARCH= @ARCH@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ @@ -110,7 +112,7 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/$(LIB) # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) @@ -692,7 +694,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h Python/getplatform.o: $(srcdir)/Python/getplatform.c - $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@ $(srcdir)/Python/getplatform.c + $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -DARCH='"$(ARCH)"' -DLIB='"$(LIB)"' -o $@ $(srcdir)/Python/getplatform.c Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c diff --git a/Modules/getpath.c b/Modules/getpath.c index c42ce31..1325050 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -100,6 +100,19 @@ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif +#ifndef LIB_PYTHON +#if defined(__x86_64__) || defined(__powerpc64__) || defined(__aarch64__) +#define LIB_PYTHON "lib64/python" VERSION +#else +#define LIB_PYTHON "lib/python" VERSION +#endif +#endif + +#ifndef PYTHONPATH +#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ + EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" +#endif + #ifndef LANDMARK #define LANDMARK "os.py" #endif @@ -108,7 +121,7 @@ static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; -static char lib_python[] = "lib/python" VERSION; +static char lib_python[] = LIB_PYTHON; static void reduce(char *dir) diff --git a/Python/getplatform.c b/Python/getplatform.c index 6899140..66a49c6 100644 --- a/Python/getplatform.c +++ b/Python/getplatform.c @@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } + +#ifndef ARCH +#define ARCH "unknown" +#endif + +const char * +Py_GetArch(void) +{ + return ARCH; +} + +#ifndef LIB +#define LIB "lib" +#endif + +const char * +Py_GetLib(void) +{ + return LIB; +} diff --git a/Python/sysmodule.c b/Python/sysmodule.c index aeff38a..8ab5111 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1439,6 +1439,10 @@ _PySys_Init(void) PyString_FromString(Py_GetPlatform())); SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); + SET_SYS_FROM_STRING("arch", + PyString_FromString(Py_GetArch())); + SET_SYS_FROM_STRING("lib", + PyString_FromString(Py_GetLib())); SET_SYS_FROM_STRING("prefix", PyString_FromString(Py_GetPrefix())); SET_SYS_FROM_STRING("exec_prefix", diff --git a/configure.ac b/configure.ac index 1273465..a60533a 100644 --- a/configure.ac +++ b/configure.ac @@ -758,6 +758,41 @@ SunOS*) ;; esac +AC_SUBST(ARCH) +AC_MSG_CHECKING(ARCH) +ARCH=`uname -m` +case $ARCH in +i?86) ARCH=i386;; +esac +AC_MSG_RESULT($ARCH) + +AC_SUBST(LIB) +AC_MSG_CHECKING(LIB) +case $ac_sys_system in +Linux*) + # Test if the compiler is 64bit + echo 'int i;' > conftest.$ac_ext + python_cv_cc_64bit_output=no + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.$ac_objext` in + *"ELF 64"*) + python_cv_cc_64bit_output=yes + ;; + esac + fi + rm -rf conftest* + ;; +esac + +case $ARCH:$python_cv_cc_64bit_output in +ppc64:yes | powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes | aarch64:yes) + LIB="lib64" + ;; +*:*) + LIB="lib" + ;; +esac +AC_MSG_RESULT($LIB) AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) diff --git a/setup.py b/setup.py index 54054c2..0fb4b7f 100644 --- a/setup.py +++ b/setup.py @@ -508,6 +508,7 @@ class PyBuildExt(build_ext): except NameError: have_unicode = 0 + libname = sys.lib # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. @@ -519,8 +520,7 @@ class PyBuildExt(build_ext): ): add_dir_to_list(inc_dirs, d) for d in ( - '/lib64', '/usr/lib64', - '/lib', '/usr/lib', + libname, '/usr/'+libname ): add_dir_to_list(lib_dirs, d) exts = [] @@ -778,11 +778,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/'+libname+'/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/'+libname+'/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: @@ -1940,8 +1940,8 @@ class PyBuildExt(build_ext): added_lib_dirs.append('/usr/openwin/lib') elif os.path.exists('/usr/X11R6/include'): include_dirs.append('/usr/X11R6/include') - added_lib_dirs.append('/usr/X11R6/lib64') - added_lib_dirs.append('/usr/X11R6/lib') + added_lib_dirs.append('/usr/X11R6/'+sys.lib) + #added_lib_dirs.append('/usr/X11R6/lib') elif os.path.exists('/usr/X11R5/include'): include_dirs.append('/usr/X11R5/include') added_lib_dirs.append('/usr/X11R5/lib')