Mailinglist Archive: opensuse-commit (1130 mails)

< Previous Next >
commit python3 for openSUSE:Factory

Hello community,

here is the log from the commit of package python3 for openSUSE:Factory
checked in at Mon Aug 15 00:06:07 CEST 2011.



--------
--- python3/python3-base.changes 2011-06-15 16:42:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/python3/python3-base.changes 2011-07-18
19:14:11.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Jul 18 16:22:31 UTC 2011 - jmatejek@xxxxxxxxxx
+
+- update to 3.2.1
+ * bugfix-only release, no major changes
+- fix build on linux3 platform
+- remove upstreamed pybench patch
+- install /usr/lib directories in all cases to prevent spurious
+ "directory not owned" in dependent packages
+
+-------------------------------------------------------------------
--- python3/python3-doc.changes 2011-03-23 05:34:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/python3/python3-doc.changes 2011-07-18
18:24:41.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 18 16:23:31 UTC 2011 - jmatejek@xxxxxxxxxx
+
+- update to build against 3.2.1
+
+-------------------------------------------------------------------
--- python3/python3.changes 2011-05-13 14:44:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/python3/python3.changes 2011-07-18
18:24:41.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 18 16:23:16 UTC 2011 - jmatejek@xxxxxxxxxx
+
+- update to 3.2.1
+- fix build on linux3
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
Python-3.2.tar.bz2
Python-3.2b2-multilib.patch
python-3.2-fix_date_time_compiler.patch
python-3.2-pybench.patch

New:
----
Python-3.2.1-multilib.patch
Python-3.2.1.tar.bz2
python-3.2-linux3.patch
python-3.2.1-fix_date_time_compiler.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python3-base.spec ++++++
--- /var/tmp/diff_new_pack.5DcMOt/_old 2011-08-15 00:05:08.000000000 +0200
+++ /var/tmp/diff_new_pack.5DcMOt/_new 2011-08-15 00:05:08.000000000 +0200
@@ -24,7 +24,7 @@
Group: Development/Languages/Python
AutoReqProv: on
Summary: Python3 Interpreter
-Version: 3.2
+Version: 3.2.1
Release: 1
%define tarversion %{version}
%define tarname Python-%{tarversion}
@@ -46,17 +46,17 @@
# implement "--record-rpm" option for distutils installations
Patch01: Python-3.0b1-record-rpm.patch
# support lib-vs-lib64 distinction
-Patch02: Python-3.2b2-multilib.patch
+Patch02: Python-3.2.1-multilib.patch
# securing usage of readlink/realpath in PySys_SetArgv
Patch03: python-2.6b1-canonicalize2.patch
# support finding packages in /usr/local, install to /usr/local by default
Patch04: python-3.2rc2-localpath.patch
# fix usage of "python" executable in "make install"
Patch05: python-3.2b2-buildtime-generate.patch
-# fix crash in pybench which was blocking builds
-Patch06: python-3.2-pybench.patch
# replace DATE, TIME and COMPILER by fixed definitions to aid reproducible
builds
-Patch07: python-3.2-fix_date_time_compiler.patch
+Patch06: python-3.2.1-fix_date_time_compiler.patch
+# support for "linux3" platform, for linux 3 kernel
+Patch07: python-3.2-linux3.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-build

@@ -250,6 +250,8 @@
# install "site-packages" and __pycache__ for third parties
install -d -m 755 ${RPM_BUILD_ROOT}%{sitedir}/site-packages
install -d -m 755 ${RPM_BUILD_ROOT}%{sitedir}/site-packages/__pycache__
+# and their 32bit counterparts explicitly
+mkdir -p
${RPM_BUILD_ROOT}/usr/lib/python%{python_version}/site-packages/__pycache__

# cleanup parts that don't belong
for so in _md5 _sha1 _sha256 _sha512; do
@@ -425,6 +427,9 @@
%{dynlib unicodedata}
%{dynlib zlib}
# python parts
+%dir /usr/lib/python%{python_version}
+%dir /usr/lib/python%{python_version}/site-packages
+%dir /usr/lib/python%{python_version}/site-packages/__pycache__
%dir %{sitedir}
%dir %{sitedir}/site-packages
%dir %{sitedir}/site-packages/__pycache__

++++++ python3-doc.spec ++++++
--- /var/tmp/diff_new_pack.5DcMOt/_old 2011-08-15 00:05:08.000000000 +0200
+++ /var/tmp/diff_new_pack.5DcMOt/_new 2011-08-15 00:05:08.000000000 +0200
@@ -24,11 +24,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation for Python.
Version: 3.2
-Release: 1
-%define pyver 3.2
+Release: 2
+%define pyver 3.2.1
BuildArch: noarch
-#%define tarname Python-%{pyver}
-%define tarname Python-3.2
+%define tarname Python-%{pyver}
%define pyname python
Enhances: %{pyname}=%{pyver}
Source0: %{tarname}.tar.bz2

++++++ python3.spec ++++++
--- /var/tmp/diff_new_pack.5DcMOt/_old 2011-08-15 00:05:08.000000000 +0200
+++ /var/tmp/diff_new_pack.5DcMOt/_new 2011-08-15 00:05:08.000000000 +0200
@@ -24,10 +24,9 @@
Group: Development/Languages/Python
AutoReqProv: on
Summary: Python3 Interpreter
-Version: 3.2
+Version: 3.2.1
Release: 1
-#%define tarversion %{version}
-%define tarversion 3.2
+%define tarversion %{version}
%define tarname Python-%{tarversion}

Requires: python3-base = %{version}
@@ -37,8 +36,9 @@
#Source11: testfiles.tar.bz2
# issues with copyrighted Unicode testing files

-Patch01: Python-3.2b2-multilib.patch
+Patch01: Python-3.2.1-multilib.patch
Patch02: python-2.6b3-curses-panel.patch
+Patch03: python-3.2-linux3.patch

BuildRoot: %{_tmppath}/%{name}-%{version}-build

@@ -107,6 +107,7 @@
# patching
%patch01 -p1
%patch02
+%patch03 -p1

# drop Autoconf version requirement
sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.in

++++++ Python-3.2b2-multilib.patch -> Python-3.2.1-multilib.patch ++++++
--- python3/Python-3.2b2-multilib.patch 2011-01-19 18:28:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/python3/Python-3.2.1-multilib.patch
2011-07-18 18:24:33.000000000 +0200
@@ -1,8 +1,8 @@
-Index: Python-3.2b2/Include/pythonrun.h
+Index: Python-3.2.1/Include/pythonrun.h
===================================================================
---- Python-3.2b2.orig/Include/pythonrun.h
-+++ Python-3.2b2/Include/pythonrun.h
-@@ -141,6 +141,8 @@ int _Py_CheckPython3();
+--- Python-3.2.1.orig/Include/pythonrun.h
++++ Python-3.2.1/Include/pythonrun.h
+@@ -175,6 +175,8 @@ int _Py_CheckPython3();
/* In their own files */
PyAPI_FUNC(const char *) Py_GetVersion(void);
PyAPI_FUNC(const char *) Py_GetPlatform(void);
@@ -11,10 +11,10 @@
PyAPI_FUNC(const char *) Py_GetCopyright(void);
PyAPI_FUNC(const char *) Py_GetCompiler(void);
PyAPI_FUNC(const char *) Py_GetBuildInfo(void);
-Index: Python-3.2b2/Lib/distutils/command/install.py
+Index: Python-3.2.1/Lib/distutils/command/install.py
===================================================================
---- Python-3.2b2.orig/Lib/distutils/command/install.py
-+++ Python-3.2b2/Lib/distutils/command/install.py
+--- Python-3.2.1.orig/Lib/distutils/command/install.py
++++ Python-3.2.1/Lib/distutils/command/install.py
@@ -27,6 +27,8 @@ else:
from site import USER_SITE
HAS_USER_SITE = True
@@ -33,10 +33,10 @@
'headers':
'$base/include/python$py_version_short$abiflags/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-Index: Python-3.2b2/Lib/distutils/sysconfig.py
+Index: Python-3.2.1/Lib/distutils/sysconfig.py
===================================================================
---- Python-3.2b2.orig/Lib/distutils/sysconfig.py
-+++ Python-3.2b2/Lib/distutils/sysconfig.py
+--- Python-3.2.1.orig/Lib/distutils/sysconfig.py
++++ Python-3.2.1/Lib/distutils/sysconfig.py
@@ -124,8 +124,11 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX

@@ -51,11 +51,11 @@
if standard_lib:
return libpython
else:
-Index: Python-3.2b2/Lib/pydoc.py
+Index: Python-3.2.1/Lib/pydoc.py
===================================================================
---- Python-3.2b2.orig/Lib/pydoc.py
-+++ Python-3.2b2/Lib/pydoc.py
-@@ -359,7 +359,7 @@ class Doc:
+--- Python-3.2.1.orig/Lib/pydoc.py
++++ Python-3.2.1/Lib/pydoc.py
+@@ -363,7 +363,7 @@ class Doc:

docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS)

@@ -64,11 +64,11 @@
"python%d.%d" % sys.version_info[:2])
if (isinstance(object, type(os)) and
(object.__name__ in ('errno', 'exceptions', 'gc', 'imp',
-Index: Python-3.2b2/Lib/site.py
+Index: Python-3.2.1/Lib/site.py
===================================================================
---- Python-3.2b2.orig/Lib/site.py
-+++ Python-3.2b2/Lib/site.py
-@@ -275,13 +275,19 @@ def getsitepackages():
+--- Python-3.2.1.orig/Lib/site.py
++++ Python-3.2.1/Lib/site.py
+@@ -285,13 +285,19 @@ def getsitepackages():
if sys.platform in ('os2emx', 'riscos'):
sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
elif os.sep == '/':
@@ -91,10 +91,10 @@
if sys.platform == "darwin":
# for framework builds *only* we add the standard Apple
# locations.
-Index: Python-3.2b2/Lib/trace.py
+Index: Python-3.2.1/Lib/trace.py
===================================================================
---- Python-3.2b2.orig/Lib/trace.py
-+++ Python-3.2b2/Lib/trace.py
+--- Python-3.2.1.orig/Lib/trace.py
++++ Python-3.2.1/Lib/trace.py
@@ -750,10 +750,10 @@ def main(argv=None):
# should I also call expanduser? (after all, could use $HOME)

@@ -108,11 +108,11 @@
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
-Index: Python-3.2b2/Makefile.pre.in
+Index: Python-3.2.1/Makefile.pre.in
===================================================================
---- Python-3.2b2.orig/Makefile.pre.in
-+++ Python-3.2b2/Makefile.pre.in
-@@ -86,6 +86,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLA
+--- Python-3.2.1.orig/Makefile.pre.in
++++ Python-3.2.1/Makefile.pre.in
+@@ -90,6 +90,8 @@ PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLA

# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
@@ -121,7 +121,7 @@

# Install prefix for architecture-independent files
prefix= @prefix@
-@@ -102,7 +104,7 @@ LIBDIR= @libdir@
+@@ -106,7 +108,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
@@ -130,7 +130,7 @@
ABIFLAGS= @ABIFLAGS@

# Detailed destination directories
-@@ -556,6 +558,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -566,6 +568,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@@ -138,7 +138,7 @@
-o $@ $(srcdir)/Modules/getpath.c

Modules/python.o: $(srcdir)/Modules/python.c
-@@ -601,7 +604,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
+@@ -611,7 +614,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)

Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -147,10 +147,10 @@

Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@
$(srcdir)/Python/importdl.c
-Index: Python-3.2b2/Modules/getpath.c
+Index: Python-3.2.1/Modules/getpath.c
===================================================================
---- Python-3.2b2.orig/Modules/getpath.c
-+++ Python-3.2b2/Modules/getpath.c
+--- Python-3.2.1.orig/Modules/getpath.c
++++ Python-3.2.1/Modules/getpath.c
@@ -121,9 +121,11 @@
#define EXEC_PREFIX PREFIX
#endif
@@ -165,19 +165,19 @@
#endif

#ifndef LANDMARK
-@@ -134,7 +136,7 @@ static wchar_t prefix[MAXPATHLEN+1];
- static wchar_t exec_prefix[MAXPATHLEN+1];
+@@ -135,7 +137,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1]
static wchar_t progpath[MAXPATHLEN+1];
static wchar_t *module_search_path = NULL;
+ static int module_search_path_malloced = 0;
-static wchar_t *lib_python = L"lib/python" VERSION;
+static wchar_t *lib_python = L"" LIB_PYTHON;

static void
reduce(wchar_t *dir)
-Index: Python-3.2b2/Python/getplatform.c
+Index: Python-3.2.1/Python/getplatform.c
===================================================================
---- Python-3.2b2.orig/Python/getplatform.c
-+++ Python-3.2b2/Python/getplatform.c
+--- Python-3.2.1.orig/Python/getplatform.c
++++ Python-3.2.1/Python/getplatform.c
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
@@ -202,11 +202,11 @@
+{
+ return LIB;
+}
-Index: Python-3.2b2/Python/sysmodule.c
+Index: Python-3.2.1/Python/sysmodule.c
===================================================================
---- Python-3.2b2.orig/Python/sysmodule.c
-+++ Python-3.2b2/Python/sysmodule.c
-@@ -1606,6 +1606,10 @@ _PySys_Init(void)
+--- Python-3.2.1.orig/Python/sysmodule.c
++++ Python-3.2.1/Python/sysmodule.c
+@@ -1560,6 +1560,10 @@ _PySys_Init(void)
PyUnicode_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
PyUnicode_FromString(Py_GetPlatform()));
@@ -217,11 +217,11 @@
SET_SYS_FROM_STRING("executable",
PyUnicode_FromWideChar(
Py_GetProgramFullPath(), -1));
-Index: Python-3.2b2/configure.in
+Index: Python-3.2.1/configure.in
===================================================================
---- Python-3.2b2.orig/configure.in
-+++ Python-3.2b2/configure.in
-@@ -580,6 +580,41 @@ hp*|HP*)
+--- Python-3.2.1.orig/configure.in
++++ Python-3.2.1/configure.in
+@@ -592,6 +592,41 @@ hp*|HP*)
esac;;
esac

@@ -263,20 +263,20 @@

AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
-Index: Python-3.2b2/setup.py
+Index: Python-3.2.1/setup.py
===================================================================
---- Python-3.2b2.orig/setup.py
-+++ Python-3.2b2/setup.py
-@@ -373,7 +373,7 @@ class PyBuildExt(build_ext):
+--- Python-3.2.1.orig/setup.py
++++ Python-3.2.1/setup.py
+@@ -396,7 +396,7 @@ class PyBuildExt(build_ext):
# Ensure that /usr/local is always used, but the local build
# directories (i.e. '.' and 'Include') must be first. See issue
# 10520.
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+ add_dir_to_list(self.compiler.library_dirs,
os.path.join('/usr/local', sys.lib))
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ self.add_multiarch_paths()

- # Add paths specified in the environment variables LDFLAGS and
-@@ -425,8 +425,7 @@ class PyBuildExt(build_ext):
+@@ -449,8 +449,7 @@ class PyBuildExt(build_ext):
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
lib_dirs = self.compiler.library_dirs + [
@@ -286,7 +286,7 @@
]
inc_dirs = self.compiler.include_dirs + ['/usr/include']
exts = []
-@@ -619,11 +618,11 @@ class PyBuildExt(build_ext):
+@@ -643,11 +642,11 @@ class PyBuildExt(build_ext):
elif curses_library:
readline_libs.append(curses_library)
elif self.compiler.find_library_file(lib_dirs +
@@ -300,7 +300,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1528,18 +1527,17 @@ class PyBuildExt(build_ext):
+@@ -1552,18 +1551,17 @@ class PyBuildExt(build_ext):
# Check for various platform-specific directories
if platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
@@ -323,10 +323,10 @@

# If Cygwin, then verify that X is installed before proceeding
if platform == 'cygwin':
-Index: Python-3.2b2/Lib/sysconfig.py
+Index: Python-3.2.1/Lib/sysconfig.py
===================================================================
---- Python-3.2b2.orig/Lib/sysconfig.py
-+++ Python-3.2b2/Lib/sysconfig.py
+--- Python-3.2.1.orig/Lib/sysconfig.py
++++ Python-3.2.1/Lib/sysconfig.py
@@ -21,10 +21,10 @@ __all__ = [

_INSTALL_SCHEMES = {

++++++ Python-3.2.tar.bz2 -> Python-3.2.1.tar.bz2 ++++++
python3/Python-3.2.tar.bz2
/mounts/work_src_done/STABLE/python3/Python-3.2.1.tar.bz2 differ: char 11, line
1

++++++ python-3.2-linux3.patch ++++++
Index: Python-3.2/Lib/distutils/tests/test_bdist_rpm.py
===================================================================
--- Python-3.2.orig/Lib/distutils/tests/test_bdist_rpm.py
+++ Python-3.2/Lib/distutils/tests/test_bdist_rpm.py
@@ -42,7 +42,7 @@ class BuildRpmTestCase(support.TempdirMa

# XXX I am unable yet to make this test work without
# spurious sdtout/stderr output under Mac OS X
- if sys.platform != 'linux2':
+ if not sys.platform.startswith('linux'):
return

# this test will run only if the rpm commands are found
@@ -82,7 +82,7 @@ class BuildRpmTestCase(support.TempdirMa

# XXX I am unable yet to make this test work without
# spurious sdtout/stderr output under Mac OS X
- if sys.platform != 'linux2':
+ if not sys.platform.startswith('linux'):
return

# http://bugs.python.org/issue1533164
Index: Python-3.2/Lib/distutils/tests/test_util.py
===================================================================
--- Python-3.2.orig/Lib/distutils/tests/test_util.py
+++ Python-3.2/Lib/distutils/tests/test_util.py
@@ -157,6 +157,15 @@ class UtilTestCase(support.EnvironGuard,

self.assertEqual(get_platform(), 'linux-i686')

+ # openSUSE linux3
+ os.name = 'posix'
+ sys.version = ('2.7 (r27:82500, Aug 07 2010, 16:54:59) [GCC]')
+ sys.platform = 'linux3'
+ self._set_uname(('Linux', 'ws-pool1', '2.6.37.6-0.5-desktop',
+ '#1 SMP PREEMPT 2011-04-25 21:48:33 +0200', 'x86_64'))
+
+ self.assertEqual(get_platform(), 'linux-x86_64')
+
# XXX more platforms to tests here

def test_convert_path(self):
Index: Python-3.2/Lib/test/regrtest.py
===================================================================
--- Python-3.2.orig/Lib/test/regrtest.py
+++ Python-3.2/Lib/test/regrtest.py
@@ -1433,6 +1433,7 @@ _expectations['freebsd5'] = _expectation
_expectations['freebsd6'] = _expectations['freebsd4']
_expectations['freebsd7'] = _expectations['freebsd4']
_expectations['freebsd8'] = _expectations['freebsd4']
+_expectations['linux3'] = _expectations['linux2']

class _ExpectedSkips:
def __init__(self):
Index: Python-3.2/Lib/test/test_socket.py
===================================================================
--- Python-3.2.orig/Lib/test/test_socket.py
+++ Python-3.2/Lib/test/test_socket.py
@@ -1998,7 +1998,7 @@ def test_main():
])
if hasattr(socket, "socketpair"):
tests.append(BasicSocketPairTest)
- if sys.platform == 'linux2':
+ if sys.platform.startswith('linux'):
tests.append(TestLinuxAbstractNamespace)
if isTipcAvailable():
tests.append(TIPCTest)
Index: Python-3.2/Lib/test/test_sysconfig.py
===================================================================
--- Python-3.2.orig/Lib/test/test_sysconfig.py
+++ Python-3.2/Lib/test/test_sysconfig.py
@@ -228,6 +228,15 @@ class TestSysConfig(unittest.TestCase):

self.assertEqual(get_platform(), 'linux-i686')

+ # openSUSE linux3
+ os.name = 'posix'
+ sys.version = ('2.7 (r27:82500, Aug 07 2010, 16:54:59) [GCC]')
+ sys.platform = 'linux3'
+ self._set_uname(('Linux', 'ws-pool1', '2.6.37.6-0.5-desktop',
+ '#1 SMP PREEMPT 2011-04-25 21:48:33 +0200', 'x86_64'))
+
+ self.assertEqual(get_platform(), 'linux-x86_64')
+
# XXX more platforms to tests here

def test_get_config_h_filename(self):
Index: Python-3.2/Lib/test/test_tarfile.py
===================================================================
--- Python-3.2.orig/Lib/test/test_tarfile.py
+++ Python-3.2/Lib/test/test_tarfile.py
@@ -687,7 +687,7 @@ class GNUReadTest(LongnameTest):
# Return True if the platform knows the st_blocks stat attribute and
# uses st_blocks units of 512 bytes, and if the filesystem is able to
# store holes in files.
- if sys.platform == "linux2":
+ if sys.platform.startswith("linux"):
# Linux evidentially has 512 byte st_blocks units.
name = os.path.join(TEMPDIR, "sparse-test")
with open(name, "wb") as fobj:
Index: Python-3.2/setup.py
===================================================================
--- Python-3.2.orig/setup.py
+++ Python-3.2/setup.py
@@ -1351,7 +1351,7 @@ class PyBuildExt(build_ext):
# End multiprocessing

# Platform-specific libraries
- if (platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
+ if (platform in ('linux2', 'linux3', 'freebsd4', 'freebsd5',
'freebsd6',
'freebsd7', 'freebsd8')
or platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
++++++ python-3.2-fix_date_time_compiler.patch ->
python-3.2.1-fix_date_time_compiler.patch ++++++
--- python3/python-3.2-fix_date_time_compiler.patch 2011-05-24
15:42:11.000000000 +0200
+++
/mounts/work_src_done/STABLE/python3/python-3.2.1-fix_date_time_compiler.patch
2011-07-18 18:24:40.000000000 +0200
@@ -1,21 +1,24 @@
-Index: Python-3.2/Makefile.pre.in
+Index: Python-3.2.1/Makefile.pre.in
===================================================================
---- Python-3.2.orig/Makefile.pre.in
-+++ Python-3.2/Makefile.pre.in
-@@ -554,7 +554,15 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
- $(SIGNAL_OBJS) \
+--- Python-3.2.1.orig/Makefile.pre.in
++++ Python-3.2.1/Makefile.pre.in
+@@ -556,12 +556,19 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c
-- $(CC) -c $(PY_CORE_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\""
-o $@ $(srcdir)/Modules/getbuildinfo.c
-+ $(CC) -c $(PY_CORE_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \
-+ -DDATE="\"`date -u -r Makefile.pre.in +"%b %d %Y"`\"" \
-+ -DTIME="\"`date -u -r Makefile.pre.in +"%T"`\"" \
-+ -o $@ $(srcdir)/Modules/getbuildinfo.c
-+
+ $(CC) -c $(PY_CORE_CFLAGS) \
++ -DDATE="\"`date -u -r Makefile.pre.in +"%b %d %Y"`\"" \
++ -DTIME="\"`date -u -r Makefile.pre.in +"%T"`\"" \
+ -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \
+ -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \
+ -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \
+ -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \
+ -o $@ $(srcdir)/Modules/getbuildinfo.c
+
+Python/getcompiler.o: $(srcdir)/Python/getcompiler.c Makefile
+ $(CC) -c $(PY_CORE_CFLAGS) \
+ -DCOMPILER='"[GCC]"' \
+ -o $@ $(srcdir)/Python/getcompiler.c
-
++
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
+ -DPREFIX='"$(prefix)"' \


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages