Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (13c9d69f823ce69fbfa84457ddbb2c23cc81c7f2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (13c9d69f823ce69fbfa84457ddbb2c23cc81c7f2)
  • Date: Sat, 23 Nov 2019 02:23:30 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

devel/python3/HISTORY | 7 +++
devel/python3/PRE_BUILD | 21 ++++++++---
devel/python3/patches-3.8/disable-compileall.patch | 37
+++++++++++++++++++++
devel/python3/patches-3.8/makefile.patch | 21 +++++++++++
devel/python3/python.gpg |binary
5 files changed, 80 insertions(+), 6 deletions(-)

New commits:
commit 13c9d69f823ce69fbfa84457ddbb2c23cc81c7f2
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/python3: overhauled patches & PRE_BUILD for devel 3.8 branch

commit 67ee3f3aa10310ea1997f377835370a57281de86
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/python3: added Łukasz Langa's key

diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index da8859a..6c5ab9b 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,10 @@
+2019-11-22 Pavel Vinogradov <public AT sourcemage.org>
+ * python.gpg: added new key,
+ E3FF2839C048B25C084DEBE9B26995E310250568,
+ Łukasz Langa <lukasz AT python.org>
+ * PRE_BUILD, patches-3.8/{disable-compileall,makefile}.patch:
+ overhauled for devel 3.8 branch
+
2019-10-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: stable version 3.7.5

diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
index dabe425..70076c1 100755
--- a/devel/python3/PRE_BUILD
+++ b/devel/python3/PRE_BUILD
@@ -1,8 +1,17 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches &&
-apply_patch_dir "patches-${VERSION%.*}" &&
-if is_depends_enabled ${SPELL} gcc && ! is_version_less $(installed_version
gcc) 4.9; then
- # Forcing GCC's builtin atomics
- sed -i 's;defined(HAVE_STD_ATOMIC);!&;' Include/pyatomic.h
-fi
+if [[ "${PYTHON3_BRANCH}" != "devel" ]]; then
+ apply_patch_dir patches &&
+ if is_depends_enabled ${SPELL} gcc &&
+ ! is_version_less $(installed_version gcc) 4.9; then
+ # Forcing GCC's builtin atomics
+ sed -i 's;defined(HAVE_STD_ATOMIC);!&;' Include/pyatomic.h
+ fi
+else
+ if is_depends_enabled ${SPELL} gcc &&
+ ! is_version_less $(installed_version gcc) 4.9; then
+ # Forcing GCC's builtin atomics
+ sed -i 's;defined(HAVE_STD_ATOMIC);!&;' Include/internal/pycore_atomic.h
+ fi
+fi &&
+apply_patch_dir "patches-${VERSION%.*}"
diff --git a/devel/python3/patches-3.8/disable-compileall.patch
b/devel/python3/patches-3.8/disable-compileall.patch
new file mode 100644
index 0000000..4ef08d1
--- /dev/null
+++ b/devel/python3/patches-3.8/disable-compileall.patch
@@ -0,0 +1,37 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1456,33 +1456,6 @@
+ $(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ fi
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST) -f \
+- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+- $(DESTDIR)$(LIBDEST)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py
\
+- -j0 -d $(LIBDEST) -f \
+- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+- $(DESTDIR)$(LIBDEST)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi -OO
$(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST) -f \
+- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+- $(DESTDIR)$(LIBDEST)
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST)/site-packages -f \
+- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py
\
+- -j0 -d $(LIBDEST)/site-packages -f \
+- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+- $(PYTHON_FOR_BUILD) -Wi -OO
$(DESTDIR)$(LIBDEST)/compileall.py \
+- -j0 -d $(LIBDEST)/site-packages -f \
+- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver
$(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver
$(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
diff --git a/devel/python3/patches-3.8/makefile.patch
b/devel/python3/patches-3.8/makefile.patch
new file mode 100644
index 0000000..ef84bed0
--- /dev/null
+++ b/devel/python3/patches-3.8/makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -694,7 +694,7 @@
+
+
+ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY)
$(PY3LIBRARY)
+- $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@
Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
++ $(CC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
+
+ ############################################################################
+ # Importlib
+@@ -760,7 +760,7 @@
+ $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/python.c
+
+ Programs/_testembed.o: $(srcdir)/Programs/_testembed.c
+- $(MAINCC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
++ $(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c
+
+ Modules/_sre.o: $(srcdir)/Modules/_sre.c $(srcdir)/Modules/sre.h
$(srcdir)/Modules/sre_constants.h $(srcdir)/Modules/sre_lib.h
+
diff --git a/devel/python3/python.gpg b/devel/python3/python.gpg
index 5430c3c..2c7aba4 100644
Binary files a/devel/python3/python.gpg and b/devel/python3/python.gpg differ



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (13c9d69f823ce69fbfa84457ddbb2c23cc81c7f2), Pavel Vinogradov, 11/22/2019

Archive powered by MHonArc 2.6.24.

Top of Page