python/makefile.mk | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit dd46274b48db84df03801dd858c52c4012cf00db
Author: Pedro Giffuni <p...@apache.org>
Date: Wed Mar 14 02:30:11 2018 +0000
python: rename pcbuild to msvs9 in patch names to avoid confusion.
Since r1759046, which updated python to version 2.7.12, we are using
the legacy buildfiles which upstream moved from PCbuild to PC/VS9.0.
We kept the old name for the patches to preserve the history in the
repository but since there is a good chance we may update the required
compiler, and use the updated build files, rename them properly to avoid
confusion.
Consistently use $(PYVERSION) while here.
Note this is untested: being a simple rename there should be no problem.
diff --git a/python/makefile.mk b/python/makefile.mk
index 337be7265957..4fb62c021f58 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -54,15 +54,15 @@ PATCH_FILES=\
.IF "$(GUI)"=="WNT"
.IF "$(CPUNAME)"=="INTEL"
-PATCH_FILES += python-$(PYVERSION)-pcbuild.patch
+PATCH_FILES += python-$(PYVERSION)-msvs9.patch
.ELIF "$(CPUNAME)"=="X86_64"
PATCH_FILES += \
- python-$(PYVERSION)-pcbuild-win64.patch \
- python-$(PYVERSION)-pcbuild-win64-target.patch \
- python-$(PYVERSION)-pcbuild-subsystem.patch \
- python-2.7.14-pcbuild-dir.patch \
- python-2.7.14-pcbuild-no-host-python.patch \
- python-2.7.14-pcbuild-python-path.patch
+ python-$(PYVERSION)-msvs9-win64.patch \
+ python-$(PYVERSION)-msvs9-win64-target.patch \
+ python-$(PYVERSION)-msvs9-subsystem.patch \
+ python-$(PYVERSION)-msvs9-dir.patch \
+ python-$(PYVERSION)-msvs9-no-host-python.patch \
+ python-$(PYVERSION)-msvs9-python-path.patch
.ENDIF
.ENDIF
diff --git a/python/python-2.7.14-pcbuild-dir.patch
b/python/python-2.7.14-msvs9-dir.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-dir.patch
rename to python/python-2.7.14-msvs9-dir.patch
diff --git a/python/python-2.7.14-pcbuild-no-host-python.patch
b/python/python-2.7.14-msvs9-no-host-python.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-no-host-python.patch
rename to python/python-2.7.14-msvs9-no-host-python.patch
diff --git a/python/python-2.7.14-pcbuild-python-path.patch
b/python/python-2.7.14-msvs9-python-path.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-python-path.patch
rename to python/python-2.7.14-msvs9-python-path.patch
diff --git a/python/python-2.7.14-pcbuild-subsystem.patch
b/python/python-2.7.14-msvs9-subsystem.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-subsystem.patch
rename to python/python-2.7.14-msvs9-subsystem.patch
diff --git a/python/python-2.7.14-pcbuild-win64-target.patch
b/python/python-2.7.14-msvs9-win64-target.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-win64-target.patch
rename to python/python-2.7.14-msvs9-win64-target.patch
diff --git a/python/python-2.7.14-pcbuild-win64.patch
b/python/python-2.7.14-msvs9-win64.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild-win64.patch
rename to python/python-2.7.14-msvs9-win64.patch
diff --git a/python/python-2.7.14-pcbuild.patch
b/python/python-2.7.14-msvs9.patch
similarity index 100%
rename from python/python-2.7.14-pcbuild.patch
rename to python/python-2.7.14-msvs9.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
