From fe4741935af668ecc2fb9052b809131c9bd275e1 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 7 Feb 2009 21:03:13 +0200 Subject: [PATCH] python: adapted and reenabled patch to avoid running compileall.py to py files from other packages --- ....disabled => dont-force-rebuild-all.patch} | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) rename python/python/{dont-force-rebuild-all.patch.disabled => dont-force-rebuild-all.patch} (76%) diff --git a/python/python/dont-force-rebuild-all.patch.disabled b/python/python/dont-force-rebuild-all.patch similarity index 76% rename from python/python/dont-force-rebuild-all.patch.disabled rename to python/python/dont-force-rebuild-all.patch index 47107ae6d..ccdfddf3c 100644 --- a/python/python/dont-force-rebuild-all.patch.disabled +++ b/python/python/dont-force-rebuild-all.patch @@ -1,7 +1,7 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../python/dont-force-rebuild-all.patch.disabled +# Filename: package/.../python/dont-force-rebuild-all.patch # Copyright (C) 2009 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf @@ -16,24 +16,20 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -Forcing rebuild of site-package files results in shared files. - - - Rene Rebe - ---- ./Makefile.pre.in.orig 2004-12-09 02:28:08.906608936 +0100 -+++ ./Makefile.pre.in 2004-12-09 02:29:16.036403656 +0100 -@@ -719,19 +719,19 @@ +--- ./Makefile.pre.in.orig 2009-02-07 20:53:36.000000000 +0200 ++++ ./Makefile.pre.in 2009-02-07 20:58:09.000000000 +0200 +@@ -880,19 +880,19 @@ $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ + -d $(LIBDEST) \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) + -x 'bad_coding|badsyntax|site-packages' $(DESTDIR)$(LIBDEST) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ @@ -44,5 +40,5 @@ Forcing rebuild of site-package files results in shared files. - -d $(LIBDEST)/site-packages -f \ + -d $(LIBDEST)/site-packages \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - - # Create the PLATDIR source directory, if one wasn't distributed.. + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ + ./$(BUILDPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"