Author: wrobell Date: Thu Aug 24 15:01:06 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from PYTHON_2_5 branch
---- Files affected:
SOURCES:
python-ac_fixes.patch (1.2 -> 1.3) , python-lib64.patch (1.13 -> 1.14)
---- Diffs:
================================================================
Index: SOURCES/python-ac_fixes.patch
diff -u SOURCES/python-ac_fixes.patch:1.2 SOURCES/python-ac_fixes.patch:1.3
--- SOURCES/python-ac_fixes.patch:1.2 Mon Jul 21 12:54:15 2003
+++ SOURCES/python-ac_fixes.patch Thu Aug 24 17:01:01 2006
@@ -1,17 +1,19 @@
-diff -Nur Python-2.3a2.orig/configure.in Python-2.3a2/configure.in
---- Python-2.3a2.orig/configure.in Wed Feb 19 16:25:07 2003
-+++ Python-2.3a2/configure.in Wed Apr 9 15:05:25 2003
-@@ -568,11 +568,11 @@
+--- Python-2.5b2/configure.in.orig 2006-07-06 11:13:35.000000000 +0100
++++ Python-2.5b2/configure.in 2006-07-12 16:30:30.000000000 +0100
+@@ -753,13 +753,13 @@
+ if test "$Py_DEBUG" = 'true' ; then
+ # Optimization messes up debuggers, so turn it off for
# debug builds.
- OPT="-g -Wall -Wstrict-prototypes"
+- OPT="-g -Wall $STRICT_PROTO"
++ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
else
-- OPT="-g -O3 -Wall -Wstrict-prototypes"
-+ OPT="-g $CPPFLAGS $CFLAGS -Wstrict-prototypes"
+- OPT="-g -O3 -Wall $STRICT_PROTO"
++ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
fi
;;
*)
-- OPT="-O3 -Wall -Wstrict-prototypes"
-+ OPT="$CPPFLAGS $CFLAGS -Wstrict-prototypes"
+- OPT="-O3 -Wall $STRICT_PROTO"
++ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO"
;;
esac
case $ac_sys_system in
================================================================
Index: SOURCES/python-lib64.patch
diff -u SOURCES/python-lib64.patch:1.13 SOURCES/python-lib64.patch:1.14
--- SOURCES/python-lib64.patch:1.13 Fri Mar 3 19:42:01 2006
+++ SOURCES/python-lib64.patch Thu Aug 24 17:01:01 2006
@@ -1,6 +1,52 @@
---- Python-2.4.1/Include/pythonrun.h.lib64 2004-10-07 05:58:06.000000000
+0200
-+++ Python-2.4.1/Include/pythonrun.h 2005-10-08 00:18:33.000000000 +0200
-@@ -93,6 +93,8 @@
+diff -Nur Python-2.5b2.orig/configure.in Python-2.5b2/configure.in
+--- Python-2.5b2.orig/configure.in 2006-07-06 11:13:35.000000000 +0100
++++ Python-2.5b2/configure.in 2006-07-12 17:42:51.000000000 +0100
+@@ -503,6 +503,41 @@
+ ;;
+ 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
++powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++ LIB="lib64"
++ ;;
++*:*)
++ LIB="lib"
++ ;;
++esac
++AC_MSG_RESULT($LIB)
+
+ AC_SUBST(LIBRARY)
+ AC_MSG_CHECKING(LIBRARY)
+diff -Nur Python-2.5b2.orig/Include/pythonrun.h
Python-2.5b2/Include/pythonrun.h
+--- Python-2.5b2.orig/Include/pythonrun.h 2006-04-03 07:26:32.000000000
+0100
++++ Python-2.5b2/Include/pythonrun.h 2006-07-12 17:42:51.000000000 +0100
+@@ -107,6 +107,8 @@
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
PyAPI_FUNC(const char *) Py_GetPlatform(void);
@@ -9,29 +55,9 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
---- Python-2.4.1/Lib/distutils/tests/test_install.py
-+++ Python-2.4.1/Lib/distutils/tests/test_install.py 2006-01-10
21:28:15.000000000 +0100
-@@ -1,6 +1,6 @@
- """Tests for distutils.command.install."""
-
--import os
-+import os,sys
- import unittest
-
- from distutils.command.install import install
-@@ -39,8 +39,9 @@
- 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"))
---- Python-2.4.1/Lib/distutils/command/install.py.lib64 2005-01-20
20:15:39.000000000 +0100
-+++ Python-2.4.1/Lib/distutils/command/install.py 2005-10-08
00:18:33.000000000 +0200
+diff -Nur Python-2.5b2.orig/Lib/distutils/command/install.py
Python-2.5b2/Lib/distutils/command/install.py
+--- Python-2.5b2.orig/Lib/distutils/command/install.py 2006-03-27
22:55:21.000000000 +0100
++++ Python-2.5b2/Lib/distutils/command/install.py 2006-07-12
17:42:51.000000000 +0100
@@ -19,6 +19,8 @@
from distutils.errors import DistutilsOptionError
from glob import glob
@@ -58,8 +84,9 @@
'headers': '$base/include/python/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
---- Python-2.4.1/Lib/distutils/sysconfig.py.lib64 2005-01-07
00:16:03.000000000 +0100
-+++ Python-2.4.1/Lib/distutils/sysconfig.py 2005-10-08 00:18:51.000000000
+0200
+diff -Nur Python-2.5b2.orig/Lib/distutils/sysconfig.py
Python-2.5b2/Lib/distutils/sysconfig.py
+--- Python-2.5b2.orig/Lib/distutils/sysconfig.py 2006-06-27
11:08:25.000000000 +0100
++++ Python-2.5b2/Lib/distutils/sysconfig.py 2006-07-12 17:42:51.000000000
+0100
@@ -99,8 +99,12 @@
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -74,9 +101,32 @@
if standard_lib:
return libpython
else:
---- Python-2.4.1/Lib/site.py.lib64 2004-07-20 04:28:28.000000000 +0200
-+++ Python-2.4.1/Lib/site.py 2005-10-08 00:18:33.000000000 +0200
-@@ -179,12 +179,18 @@
+diff -Nur Python-2.5b2.orig/Lib/distutils/tests/test_install.py
Python-2.5b2/Lib/distutils/tests/test_install.py
+--- Python-2.5b2.orig/Lib/distutils/tests/test_install.py 2004-06-26
00:02:59.000000000 +0100
++++ Python-2.5b2/Lib/distutils/tests/test_install.py 2006-07-12
17:42:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ """Tests for distutils.command.install."""
+
+-import os
++import os,sys
+ import unittest
+
+ from distutils.command.install import install
+@@ -39,8 +39,9 @@
+ 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 -Nur Python-2.5b2.orig/Lib/site.py Python-2.5b2/Lib/site.py
+--- Python-2.5b2.orig/Lib/site.py 2006-06-12 09:23:02.000000000 +0100
++++ Python-2.5b2/Lib/site.py 2006-07-12 17:42:51.000000000 +0100
+@@ -182,12 +182,18 @@
sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
elif os.sep == '/':
sitedirs = [os.path.join(prefix,
@@ -98,9 +148,45 @@
if sys.platform == 'darwin':
# for framework builds *only* we add the standard Apple
# locations. Currently only per-user, but /Library and
---- Python-2.4.1/Modules/getpath.c.lib64 2004-08-08 03:00:47.000000000
+0200
-+++ Python-2.4.1/Modules/getpath.c 2005-10-08 00:18:33.000000000 +0200
-@@ -111,9 +111,17 @@
+diff -Nur Python-2.5b2.orig/Makefile.pre.in Python-2.5b2/Makefile.pre.in
+--- Python-2.5b2.orig/Makefile.pre.in 2006-06-27 16:45:32.000000000 +0100
++++ Python-2.5b2/Makefile.pre.in 2006-07-12 17:42:51.000000000 +0100
+@@ -75,6 +75,8 @@
+
+ # Machine-dependent subdirectories
+ MACHDEP= @MACHDEP@
++LIB= @LIB@
++ARCH= @ARCH@
+
+ # Install prefix for architecture-independent files
+ prefix= @prefix@
+@@ -84,11 +86,11 @@
+
+ # Expanded directories
+ BINDIR= $(exec_prefix)/bin
+-LIBDIR= $(exec_prefix)/lib
++LIBDIR= $(exec_prefix)/$(LIB)
+ MANDIR= @mandir@
+ INCLUDEDIR= @includedir@
+ CONFINCLUDEDIR= $(exec_prefix)/include
+-SCRIPTDIR= $(prefix)/lib
++SCRIPTDIR= $(prefix)/$(LIB)
+
+ # Detailed destination directories
+ BINLIBDEST= $(LIBDIR)/python$(VERSION)
+@@ -489,7 +491,7 @@
+ Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(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 -Nur Python-2.5b2.orig/Modules/getpath.c Python-2.5b2/Modules/getpath.c
+--- Python-2.5b2.orig/Modules/getpath.c 2006-07-10 02:18:57.000000000
+0100
++++ Python-2.5b2/Modules/getpath.c 2006-07-12 17:42:51.000000000 +0100
+@@ -116,9 +116,17 @@
#define EXEC_PREFIX PREFIX
#endif
@@ -120,7 +206,7 @@
#endif
#ifndef LANDMARK
-@@ -124,7 +132,7 @@
+@@ -129,7 +137,7 @@
static char exec_prefix[MAXPATHLEN+1];
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL;
@@ -129,8 +215,9 @@
static void
reduce(char *dir)
---- Python-2.4.1/Python/getplatform.c.lib64 2000-09-02 01:29:28.000000000
+0200
-+++ Python-2.4.1/Python/getplatform.c 2005-10-08 00:18:33.000000000 +0200
+diff -Nur Python-2.5b2.orig/Python/getplatform.c
Python-2.5b2/Python/getplatform.c
+--- Python-2.5b2.orig/Python/getplatform.c 2000-09-02 00:29:29.000000000
+0100
++++ Python-2.5b2/Python/getplatform.c 2006-07-12 17:42:51.000000000 +0100
@@ -10,3 +10,23 @@
{
return PLATFORM;
@@ -155,102 +242,22 @@
+{
+ return LIB;
+}
---- Python-2.4.1/Python/sysmodule.c.lib64 2005-01-27 19:58:30.000000000
+0100
-+++ Python-2.4.1/Python/sysmodule.c 2005-10-08 00:18:33.000000000 +0200
-@@ -1022,6 +1022,12 @@
+diff -Nur Python-2.5b2.orig/Python/sysmodule.c Python-2.5b2/Python/sysmodule.c
+--- Python-2.5b2.orig/Python/sysmodule.c 2006-07-10 22:08:24.000000000
+0100
++++ Python-2.5b2/Python/sysmodule.c 2006-07-12 17:42:51.000000000 +0100
+@@ -1152,4 +1152,8 @@
PyDict_SetItemString(sysdict, "platform",
- v = PyString_FromString(Py_GetPlatform()));
- Py_XDECREF(v);
+ PyString_FromString(Py_GetPlatform()));
+ PyDict_SetItemString(sysdict, "arch",
-+ v = PyString_FromString(Py_GetArch()));
-+ Py_XDECREF(v);
++ PyString_FromString(Py_GetArch()));
+ PyDict_SetItemString(sysdict, "lib",
-+ v = PyString_FromString(Py_GetLib()));
-+ Py_XDECREF(v);
++ PyString_FromString(Py_GetLib()));
PyDict_SetItemString(sysdict, "executable",
v = PyString_FromString(Py_GetProgramFullPath()));
- Py_XDECREF(v);
---- Python-2.4.1/configure.in.lib64 2005-03-29 01:23:34.000000000 +0200
-+++ Python-2.4.1/configure.in 2005-10-08 00:18:33.000000000 +0200
-@@ -423,6 +423,41 @@
- ;;
- 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
-+powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
-+ LIB="lib64"
-+ ;;
-+*:*)
-+ LIB="lib"
-+ ;;
-+esac
-+AC_MSG_RESULT($LIB)
-
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
---- Python-2.4.1/Makefile.pre.in.lib64 2005-03-29 01:23:01.000000000 +0200
-+++ Python-2.4.1/Makefile.pre.in 2005-10-08 00:18:33.000000000 +0200
-@@ -70,6 +70,8 @@
-
- # Machine-dependent subdirectories
- MACHDEP= @MACHDEP@
-+LIB= @LIB@
-+ARCH= @ARCH@
-
- # Install prefix for architecture-independent files
- prefix= @prefix@
-@@ -79,11 +81,11 @@
-
- # Expanded directories
- BINDIR= $(exec_prefix)/bin
--LIBDIR= $(exec_prefix)/lib
-+LIBDIR= $(exec_prefix)/$(LIB)
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/$(LIB)
-
- # Detailed destination directories
- BINLIBDEST= $(LIBDIR)/python$(VERSION)
-@@ -458,7 +460,7 @@
- Python/compile.o Python/symtable.o: $(GRAMMAR_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
---- Python-2.4.1/setup.py.lib64 2005-10-08 00:18:33.000000000 +0200
-+++ Python-2.4.1/setup.py 2005-10-08 00:18:33.000000000 +0200
-@@ -259,12 +259,12 @@
+diff -Nur Python-2.5b2.orig/setup.py Python-2.5b2/setup.py
+--- Python-2.5b2.orig/setup.py 2006-06-30 07:18:39.000000000 +0100
++++ Python-2.5b2/setup.py 2006-07-12 17:45:14.000000000 +0100
+@@ -290,12 +290,12 @@
except NameError:
have_unicode = 0
@@ -265,21 +272,21 @@
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
-@@ -426,11 +426,11 @@
+@@ -496,11 +496,11 @@
elif self.compiler.find_library_file(lib_dirs, 'curses'):
readline_libs.append('curses')
elif self.compiler.find_library_file(lib_dirs +
- ['/usr/lib/termcap'],
-+ ['/usr/'+libname+'/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'],
++ library_dirs=['/usr' + libname +
'termcap'],
+ extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
if platform not in ['mac']:
- # crypt module.
-@@ -1017,8 +1017,8 @@
+@@ -1244,8 +1244,8 @@
added_lib_dirs.append('/usr/openwin/lib')
elif os.path.exists('/usr/X11R6/include'):
include_dirs.append('/usr/X11R6/include')
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/python-ac_fixes.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/python-lib64.patch?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
