From d779e82840e3c9d58d86957d412fa6098e2a7157 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 29 Jun 2016 20:48:31 +0200 Subject: package/python: bump version to 2.7.12 Rebased 011-remove-python-symlink.patch [Peter: correct .hash file comment as pointed out by Baruch] Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/python/011-remove-python-symlink.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'package/python/011-remove-python-symlink.patch') diff --git a/package/python/011-remove-python-symlink.patch b/package/python/011-remove-python-symlink.patch index b0548c31df..fed46f0b86 100644 --- a/package/python/011-remove-python-symlink.patch +++ b/package/python/011-remove-python-symlink.patch @@ -5,20 +5,22 @@ Buildroot needs to control to what python interpreter (python2 or python3) the python symlink points to. Signed-off-by: Samuel Martin +Signed-off-by: Bernd Kuhls +(rebased against version 2.7.12) Index: b/Makefile.pre.in =================================================================== --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -890,17 +890,10 @@ - # $(PYTHON) -> python2 -> python$(VERSION)) - # Also create equivalent chains for other installed files - bininstall: altbininstall +@@ -974,17 +974,11 @@ + echo "Creating directory $(LIBPC)"; \ + $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ + fi - -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ - then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ - else true; \ - fi -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) + (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) -rm -f $(DESTDIR)$(BINDIR)/python2-config -- cgit v1.2.3