Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d5215d70c14c7925d60fd398e7d2cf03befa652a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d5215d70c14c7925d60fd398e7d2cf03befa652a)
  • Date: Tue, 4 Feb 2020 23:43:50 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/python3/DEPENDS | 7 +------
devel/python3/DETAILS | 8 +++++---
devel/python3/HISTORY | 6 ++++++
devel/python3/PREPARE | 7 ++++++-
devel/python3/PRE_BUILD | 17 +++--------------
5 files changed, 21 insertions(+), 24 deletions(-)

New commits:
commit d5215d70c14c7925d60fd398e7d2cf03befa652a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

python3: Rename branches for sensible tracking

commit 09387fdd8229085667dbd6c1776b30242fa9ffcc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

python3: Simplify PRE_BUILD

- Use only VERSION for patch selection
- Remove stdatomic patch (not needed)

commit 891a927e30a6c4d09c6905b78026f8caeb2b3578
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

python3: remove dependency on g++; breaks the build

diff --git a/devel/python3/DEPENDS b/devel/python3/DEPENDS
index 44ff874..808f125 100755
--- a/devel/python3/DEPENDS
+++ b/devel/python3/DEPENDS
@@ -5,9 +5,4 @@ optional_depends sqlite "" "" "for SQLite db support" &&
optional_depends tk "" "" "for Tk support" &&
optional_depends ncurses "" "" "for Ncurses support" &&
optional_depends readline "" "" "for Readline support" &&
-optional_depends expat "--with-system-expat" "" "for XML parser module" &&
-
-optional_depends -sub CXX gcc \
- "--with-cxx-main=g++" \
- "--without-cxx-main" \
- "for C++ module support"
+optional_depends expat "--with-system-expat" "" "for XML parser module"
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index fb24d06..9ac451e 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,10 +1,12 @@
SPELL=python3
case "$PYTHON3_BRANCH" in
- devel)
+ devel| \
+ stable| \
+ 3.8)
VERSION=3.8.1 ;;
- stable)
+ 3.7)
VERSION=3.7.6 ;;
- old)
+ 3.6)
VERSION=3.6.10 ;;
esac
SECURITY_PATCH=8
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index a95797f..1aa50e6 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,9 @@
+2020-02-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: Removed dependency on g++; breaks the build
+ * PRE_BUILD: Removed stdatomic edit, as it is correctly detected;
+ Simplified, use only VERSION for patch selection
+ * DETAILS, PREPARE: Renamed branches
+
2019-12-19 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: versions 3.8.1/3.7.6/3.6.10

diff --git a/devel/python3/PREPARE b/devel/python3/PREPARE
index 2c30805..4527276 100755
--- a/devel/python3/PREPARE
+++ b/devel/python3/PREPARE
@@ -1,2 +1,7 @@
. "${GRIMOIRE}/FUNCTIONS" &&
-prepare_select_branch stable devel old
+prepare_select_branch \
+ stable \
+ devel \
+ 3.8 \
+ 3.7 \
+ 3.6
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
index 70076c1..63d1dad 100755
--- a/devel/python3/PRE_BUILD
+++ b/devel/python3/PRE_BUILD
@@ -1,17 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-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 &&
+case "$VERSION" in 3.[67].*)
+ apply_patch_dir patches ;;
+esac &&
apply_patch_dir "patches-${VERSION%.*}"



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (d5215d70c14c7925d60fd398e7d2cf03befa652a), Ismael Luceno, 02/04/2020

Archive powered by MHonArc 2.6.24.

Top of Page