Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

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

 devel/python3/HISTORY                    |    5 +++++
 devel/python3/PRE_BUILD                  |    5 ++---
 devel/python3/patches-3.7/makefile.patch |   21 +++++++++++++++++++++
 devel/python3/patches-3.7/pystate.patch  |   14 ++++++++++++++
 devel/python3/patches/makefile.patch     |   21 ---------------------
 devel/python3/patches/pystate.patch      |   14 --------------
 6 files changed, 42 insertions(+), 38 deletions(-)

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

    devel/python3: split the patches, some of them are for devel branch only

diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index da01c29..1ddd3d9 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2019-01-04 Pavel Vinogradov <public AT sourcemage.org>
+       * PRE_BUILD, patches/makefile.patch, patches/pystate.patch,
+         patches-3.7/makefile.patch, patches-3.7/pystate.patch: split the
+         patches, some of them are for devel branch only
+
 2018-12-24 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: versions 3.7.2/3.6.8
        * patches/makefile.patch: updated
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
index 508e88f..dabe425 100755
--- a/devel/python3/PRE_BUILD
+++ b/devel/python3/PRE_BUILD
@@ -1,8 +1,7 @@
 default_pre_build      &&
 cd "$SOURCE_DIRECTORY" &&
-if [[ "${PYTHON3_BRANCH}" == "devel" ]]; then
-  apply_patch_dir patches
-fi &&
+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
diff --git a/devel/python3/patches-3.7/makefile.patch 
b/devel/python3/patches-3.7/makefile.patch
new file mode 100644
index 0000000..bda77ca
--- /dev/null
+++ b/devel/python3/patches-3.7/makefile.patch
@@ -0,0 +1,21 @@
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -716,7 +716,7 @@
+       fi
+ 
+ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) 
$(PY3LIBRARY)
+-      $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ 
Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++      $(CC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o 
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+ ############################################################################
+ # Importlib
+@@ -775,7 +775,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/patches-3.7/pystate.patch 
b/devel/python3/patches-3.7/pystate.patch
new file mode 100644
index 0000000..da28050
--- /dev/null
+++ b/devel/python3/patches-3.7/pystate.patch
@@ -0,0 +1,14 @@
+diff --git a/Include/pystate.h b/Include/pystate.h
+--- a/Include/pystate.h
++++ b/Include/pystate.h
+@@ -81,9 +81,9 @@
+         .install_signal_handlers = -1, \
+         .ignore_environment = -1, \
+         .use_hash_seed = -1, \
+-        .coerce_c_locale = -1, \
+         .faulthandler = -1, \
+         .tracemalloc = -1, \
++        .coerce_c_locale = -1, \
+         .utf8_mode = -1, \
+         .argc = -1, \
+         .nmodule_search_path = -1}
diff --git a/devel/python3/patches/makefile.patch 
b/devel/python3/patches/makefile.patch
deleted file mode 100644
index bda77ca..0000000
--- a/devel/python3/patches/makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile.pre.in b/Makefile.pre.in
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -716,7 +716,7 @@
-       fi
- 
- Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) 
$(PY3LIBRARY)
--      $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ 
Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+      $(CC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o 
$(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
- 
- ############################################################################
- # Importlib
-@@ -775,7 +775,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/patches/pystate.patch 
b/devel/python3/patches/pystate.patch
deleted file mode 100644
index da28050..0000000
--- a/devel/python3/patches/pystate.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/Include/pystate.h b/Include/pystate.h
---- a/Include/pystate.h
-+++ b/Include/pystate.h
-@@ -81,9 +81,9 @@
-         .install_signal_handlers = -1, \
-         .ignore_environment = -1, \
-         .use_hash_seed = -1, \
--        .coerce_c_locale = -1, \
-         .faulthandler = -1, \
-         .tracemalloc = -1, \
-+        .coerce_c_locale = -1, \
-         .utf8_mode = -1, \
-         .argc = -1, \
-         .nmodule_search_path = -1}