You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2012/07/31 17:28:37 UTC
svn commit: r1367616 - /incubator/ooo/trunk/main/python/makefile.mk
Author: pfg
Date: Tue Jul 31 15:28:37 2012
New Revision: 1367616
URL: http://svn.apache.org/viewvc?rev=1367616&view=rev
Log:
Make sure we use all the patches for Windows. Reported by Tsutomu Uchino.
Modified:
incubator/ooo/trunk/main/python/makefile.mk
Modified: incubator/ooo/trunk/main/python/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/python/makefile.mk?rev=1367616&r1=1367615&r2=1367616&view=diff
==============================================================================
--- incubator/ooo/trunk/main/python/makefile.mk (original)
+++ incubator/ooo/trunk/main/python/makefile.mk Tue Jul 31 15:28:37 2012
@@ -49,7 +49,8 @@ PATCH_FILES=\
python-md5.patch \
python-ssl.patch \
python-$(PYVERSION)-sysbase.patch \
- python-$(PYVERSION)-nohardlink.patch
+ python-$(PYVERSION)-nohardlink.patch \
+ python-$(PYVERSION)-pcbuild.patch
CONFIGURE_DIR=
@@ -109,8 +110,6 @@ BUILD_ACTION=$(ENV_BUILD) make && make i
BUILD_DIR=PCbuild
-PATCH_FILES=python-$(PYVERSION)-pcbuild.patch
-
# Build python executable and then runs a minimal script. Running the minimal script
# ensures that certain *.pyc files are generated which would otherwise be created on
# solver during registration in insetoo_native