[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac download.lst python3/ExternalPackage_python3.mk python3/i100492-freebsd.patch.1 python3/python-3.3.0-15833.patch.1 python3/python-3.3.0-aix.patch.1 python3/python-3.3.0-elf-rpath.patch.1 python3/python-3.3.0-ffi-clang.patch.1 python3/python-3.3.3-aix.patch.1 python3/python-3.3.3-elf-rpath.patch.1 python3/UnpackedTarball_python3.mk
Michael Stahl
mstahl at redhat.com
Wed Jan 8 13:39:02 PST 2014
configure.ac | 2
download.lst | 2
python3/ExternalPackage_python3.mk | 14 +-
python3/UnpackedTarball_python3.mk | 11 --
python3/i100492-freebsd.patch.1 | 2
python3/python-3.3.0-15833.patch.1 | 25 -----
python3/python-3.3.0-aix.patch.1 | 156 ---------------------------------
python3/python-3.3.0-elf-rpath.patch.1 | 13 --
python3/python-3.3.0-ffi-clang.patch.1 | 40 --------
python3/python-3.3.3-aix.patch.1 | 145 ++++++++++++++++++++++++++++++
python3/python-3.3.3-elf-rpath.patch.1 | 13 ++
11 files changed, 170 insertions(+), 253 deletions(-)
New commits:
commit 5d207e1a819a679738e0299972cef3d280122596
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Jan 6 16:05:56 2014 +0100
fdo#73087: python3: upgrade to version 3.3.3
- drop obsolete/upstreamed patches:
python-3.3.0-ffi-clang.patch.1
python-3.3.0-15833.patch.1
one hunk of python-3.3.0-aix.patch.1 in fficonfig.py.in
Reviewed-on: https://gerrit.libreoffice.org/7278
Tested-by: LibreOffice gerrit bot <gerrit at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
(cherry picked from commit 45c537a1185dfca7e51229dde9e9220e5174bd57)
Conflicts:
external/python3/python-3.3.0-aix.patch.1
external/python3/python-3.3.0-elf-rpath.patch.1
external/python3/python-3.3.3-aix.patch.1
external/python3/python-3.3.3-elf-rpath.patch.1
python3/ExternalPackage_python3.mk
python3/UnpackedTarball_python3.mk
python3/python-3.3.0-15833.patch.1
python3/python-3.3.0-aix.patch.1
python3/python-3.3.0-elf-rpath.patch.1
python3/python-3.3.0-ffi-clang.patch.1
Change-Id: I12f0f78a172067986b63455847015ea2430a084c
Reviewed-on: https://gerrit.libreoffice.org/7290
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/configure.ac b/configure.ac
index 4db89a0..0efa57f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7577,7 +7577,7 @@ internal)
SYSTEM_PYTHON=NO
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.0
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
diff --git a/download.lst b/download.lst
index ea91017..789221f 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_TARBALL := b3b2524f72409d919a4137826a870a8f-Python-3.3.0.tar.bz2
+export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2
export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 597062c..3cd2126 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -116,6 +116,13 @@ endif
# headers are not delivered, but used from unpacked dir Include/
# (+ toplevel for pyconfig.h)
+# that one is generated...
+ifneq ($(OS)-$(COM),WNT-MSC)
+$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
+ LO_lib/_sysconfigdata.py \
+))
+endif
+
# packages not shipped:
# dbm, sqlite3 - need some database stuff
# curses - need curses to build the C module
@@ -150,13 +157,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAM
Lib/plat-aix4/IN.py \
))
-# that one is generated...
-ifneq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
- Lib/_sysconfigdata.py \
-))
-endif
-
$(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(gb_Package_PROGRAMDIRNAME)/python-core-$(PYTHON_VERSION)/lib,\
LICENSE \
Lib/__future__.py \
diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk
index 0d5fce5..9bf6961 100644
--- a/python3/UnpackedTarball_python3.mk
+++ b/python3/UnpackedTarball_python3.mk
@@ -22,27 +22,20 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
python3/i100492-freebsd.patch.1 \
python3/python-3.3.0-i42553.patch.2 \
- python3/python-3.3.0-aix.patch.1 \
+ python3/python-3.3.3-aix.patch.1 \
python3/python-3.3.0-darwin.patch.1 \
python3/python-3.3.0-msvc2012.patch.1 \
python3/python-3.3.0-msvc-disable.patch.1 \
python3/python-3.3.0-msvc-x64.patch.1 \
python3/python-3.3.0-ssl.patch.1 \
python3/python-3.3.0-implicit-int.patch.1 \
- python3/python-3.3.0-ffi-clang.patch.1 \
python3/python-3.3.0-gcc-4.8.patch.1 \
python3/python-3.3.0-pythreadstate.patch.1 \
))
-ifneq ($(OS),WNT)
-$(eval $(call gb_UnpackedTarball_add_patches,python3,\
- python3/python-3.3.0-15833.patch.1 \
-))
-endif
-
ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
$(eval $(call gb_UnpackedTarball_add_patches,python3,\
- python3/python-3.3.0-elf-rpath.patch.1 \
+ python3/python-3.3.3-elf-rpath.patch.1 \
))
endif
diff --git a/python3/i100492-freebsd.patch.1 b/python3/i100492-freebsd.patch.1
index d797ac1..7189a7e 100644
--- a/python3/i100492-freebsd.patch.1
+++ b/python3/i100492-freebsd.patch.1
@@ -22,7 +22,7 @@ FreeBSD porting fixes, patch by maho at openoffice.org
# on platforms known to behave badly.
- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5',
- 'os2emx')
+ 'os2emx', 'hp-ux11')
def _run_and_join(self, script):
--- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000
diff --git a/python3/python-3.3.0-15833.patch.1 b/python3/python-3.3.0-15833.patch.1
deleted file mode 100644
index 71cef94..0000000
--- a/python3/python-3.3.0-15833.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-iff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
---- a/Lib/importlib/_bootstrap.py
-+++ b/Lib/importlib/_bootstrap.py
-@@ -1066,17 +1066,17 @@ class SourceFileLoader(FileLoader, Sourc
- except FileExistsError:
- # Probably another Python process already created the dir.
- continue
-- except PermissionError:
-- # If can't get proper access, then just forget about writing
-- # the data.
-+ except OSError as exc:
-+ # Could be a permission error, read-only filesystem: just forget
-+ # about writing the data.
-+ _verbose_message('could not create {!r}: {!r}', parent, exc)
- return
- try:
- _write_atomic(path, data, _mode)
- _verbose_message('created {!r}', path)
-- except (PermissionError, FileExistsError):
-- # Don't worry if you can't write bytecode or someone is writing
-- # it at the same time.
-- pass
-+ except OSError as exc:
-+ # Same as above: just don't write the bytecode.
-+ _verbose_message('could not create {!r}: {!r}', path, exc)
diff --git a/python3/python-3.3.0-ffi-clang.patch.1 b/python3/python-3.3.0-ffi-clang.patch.1
deleted file mode 100644
index 0dcbc42..0000000
--- a/python3/python-3.3.0-ffi-clang.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-fix clang build problem:
-
-python3/Modules/_ctypes/libffi/src/x86/sysv.S:389:17: error: invalid variant ´rel´
-Patch by: Rafael Avila de Espindola <respindola at mozilla dot com>
-https://417179.bugs.gentoo.org/attachment.cgi?id=313299
-
-diff -ru python3.old/Modules/_ctypes/libffi/configure.ac python3/Modules/_ctypes/libffi/configure.ac
---- python3.old/Modules/_ctypes/libffi/configure.ac 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/_ctypes/libffi/configure.ac 2012-11-27 16:12:44.421564130 +0100
-@@ -303,10 +303,10 @@
- if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64; then
- AC_CACHE_CHECK([assembler supports pc related relocs],
- libffi_cv_as_x86_pcrel, [
-- libffi_cv_as_x86_pcrel=yes
-+ libffi_cv_as_x86_pcrel=no
- echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-- libffi_cv_as_x86_pcrel=no
-+ if $CC $CFLAGS -c conftest.s > /dev/null; then
-+ libffi_cv_as_x86_pcrel=yes
- fi
- ])
- if test "x$libffi_cv_as_x86_pcrel" = xyes; then
-diff -ru python3.old/Modules/_ctypes/libffi/configure python3/Modules/_ctypes/libffi/configure
---- python3.old/Modules/_ctypes/libffi/configure 2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/_ctypes/libffi/configure 2012-11-27 16:12:44.420564130 +0100
-@@ -14322,10 +14322,10 @@
- $as_echo_n "(cached) " >&6
- else
-
-- libffi_cv_as_x86_pcrel=yes
-+ libffi_cv_as_x86_pcrel=no
- echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-- if $CC $CFLAGS -c conftest.s 2>&1 | $EGREP -i 'illegal|warning' > /dev/null; then
-- libffi_cv_as_x86_pcrel=no
-+ if $CC $CFLAGS -c conftest.s > /dev/null; then
-+ libffi_cv_as_x86_pcrel=yes
- fi
-
- fi
diff --git a/python3/python-3.3.0-aix.patch.1 b/python3/python-3.3.3-aix.patch.1
similarity index 77%
rename from python3/python-3.3.0-aix.patch.1
rename to python3/python-3.3.3-aix.patch.1
index f8dceb2..f510a81 100644
--- a/python3/python-3.3.0-aix.patch.1
+++ b/python3/python-3.3.3-aix.patch.1
@@ -1,7 +1,7 @@
build with GCC on AIX
---- Python-3.3.0/configure 2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.0/configure 2012-11-28 09:06:23.037963934 +0000
+--- Python-3.3.3/configure 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.3/configure 2012-11-28 09:06:23.037963934 +0000
@@ -3426,8 +3426,6 @@
else
@@ -49,8 +49,8 @@ build with GCC on AIX
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.0/configure.ac 2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.0/configure.ac 2012-11-28 09:06:23.038963946 +0000
+--- Python-3.3.3/configure.ac 2012-11-28 09:05:45.990529603 +0000
++++ Python-3.3.3/configure.ac 2012-11-28 09:06:23.038963946 +0000
@@ -545,8 +545,6 @@
without_gcc=$withval;;
esac], [
@@ -98,8 +98,8 @@ build with GCC on AIX
;;
IRIX/5*) LDSHARED="ld -shared";;
IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.0/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
-+++ Python-3.3.0/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
+--- Python-3.3.3/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000
++++ Python-3.3.3/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000
@@ -493,14 +493,20 @@
libpython$(LDVERSION).so: $(LIBRARY_OBJS)
@@ -130,21 +130,10 @@ build with GCC on AIX
+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH="`pwd`${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"; \
+ export LIBPATH; LIBPATH="`pwd`${LIBPATH:+:$LIBPATH}"; \
export EXE; EXE="$(BUILDEXE)"; \
- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
-
---- Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:05:45.889528418 +0000
-+++ Python-3.3.0/Modules/_ctypes/libffi/fficonfig.py.in 2012-11-28 09:06:23.046964040 +0000
-@@ -16,7 +16,7 @@
- 'M32R': ['src/m32r/sysv.S', 'src/m32r/ffi.c'],
- 'M68K': ['src/m68k/ffi.c', 'src/m68k/sysv.S'],
- 'POWERPC': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S', 'src/powerpc/linux64.S', 'src/powerpc/linux64_closure.S'],
-- 'POWERPC_AIX': ['src/powerpc/ffi.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
-+ 'POWERPC_AIX': ['src/powerpc/ffi_darwin.c', 'src/powerpc/aix.S', 'src/powerpc/aix_closure.S'],
- 'POWERPC_FREEBSD': ['src/powerpc/ffi.c', 'src/powerpc/sysv.S', 'src/powerpc/ppc_closure.S'],
- 'ARM': ['src/arm/sysv.S', 'src/arm/ffi.c'],
- 'LIBFFI_CRIS': ['src/cris/sysv.S', 'src/cris/ffi.c'],
---- Python-3.3.0/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
-+++ Python-3.3.0/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
+ if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
+ export PYTHON_FOR_BUILD; \
+--- Python-3.3.3/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000
++++ Python-3.3.3/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000
@@ -177,7 +177,7 @@
#_bisect _bisectmodule.c # Bisection algorithms
#_heapq _heapqmodule.c # Heap queue algorithm
diff --git a/python3/python-3.3.0-elf-rpath.patch.1 b/python3/python-3.3.3-elf-rpath.patch.1
similarity index 94%
rename from python3/python-3.3.0-elf-rpath.patch.1
rename to python3/python-3.3.3-elf-rpath.patch.1
index 0007d6b..33de913 100644
--- a/python3/python-3.3.0-elf-rpath.patch.1
+++ b/python3/python-3.3.3-elf-rpath.patch.1
@@ -9,5 +9,5 @@ set RPATH (only to be used on ELF platforms)
- $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ $(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN
- platform: $(BUILDPYTHON) $(SYSCONFIGDATA)
+ platform: $(BUILDPYTHON) pybuilddir.txt
$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
More information about the Libreoffice-commits
mailing list