Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b0a46492834b7f2ebd40bb6e5630142daf55dab)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b0a46492834b7f2ebd40bb6e5630142daf55dab)
  • Date: Sat, 20 Oct 2012 09:48:11 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
FUNCTIONS | 6 +++---
devel/python3/CONFIGURE | 1 +
devel/python3/CONFLICTS | 1 +
devel/python3/DETAILS | 3 +--
devel/python3/HISTORY | 5 +++++
devel/python3/INSTALL | 14 +++-----------
devel/python3/PRE_BUILD | 4 ----
8 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 8b0a46492834b7f2ebd40bb6e5630142daf55dab
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

FUNCTIONS - explicitly use python2

commit 204dd070285c070830a8235d46296c068c60f65e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

python3: => 3.3.0

commit 9506241108f58415d73fad48fb00c8cf636012e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

Revert "python3: https://bugs.gentoo.org/374579 added same to fix
installs."

This reverts commit 163fe097fca966a32f07abb97ac4ff906a863112.

plat-linux[2,3] no longer exit

Conflicts:
devel/python3/HISTORY
devel/python3/INSTALL

diff --git a/ChangeLog b/ChangeLog
index 2391c59..709385d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-10-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * FUNCTIONS: explicity use python2
+
2012-10-19 Robin Cook <rcook AT wyrms.net>
* libs/libguess: new spell, high-speed character detection library

diff --git a/FUNCTIONS b/FUNCTIONS
index c0fc73c..2fbe0f1 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -426,10 +426,10 @@ function unpack_file() {
}

#-------------------------------------------------------------------------
-## Default build for Python spell.
+## Default build for Python2 spell.
#-------------------------------------------------------------------------
function default_build_python() {
- python setup.py build "$@"
+ python2 setup.py build "$@"
}

#-------------------------------------------------------------------------
@@ -443,7 +443,7 @@ function default_build_python3() {
## Default install for Python spell.
#-------------------------------------------------------------------------
function default_install_python() {
- python setup.py install --root "$INSTALL_ROOT/" "$@"
+ python2 setup.py install --root "$INSTALL_ROOT/" "$@"
}

#-------------------------------------------------------------------------
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index 81a0a33..dfbe08c 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -1,4 +1,5 @@
config_query PY3K "Use Python 3 as primary version on the system?" n &&
+config_query SYMLINK "create symlinks for python -> python3" n &&

config_query_option PYTHON3_OPTS \
"Enable IPv6?" y \
diff --git a/devel/python3/CONFLICTS b/devel/python3/CONFLICTS
index ef99b71..4a8ea12 100755
--- a/devel/python3/CONFLICTS
+++ b/devel/python3/CONFLICTS
@@ -1 +1,2 @@
conflicts python3000 y
+conflicts faulthandler y
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index be02097..3a3f8a0 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,7 +1,6 @@
SPELL=python3
- VERSION=3.2.3
+ VERSION=3.3.0
SECURITY_PATCH=1
- PATCHLEVEL=1
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 775ed53..fdbfa25 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,8 @@
+2012-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.0
+ * CONFIGURE, INSTALL: make symlinks optional
+ * CONFLICTS: add faulthandler ( now included in python3)
+
2012-04-24 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: add some symlinks
* DETAILS: PATCHLEVEL=1
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 4d52c1e..5d05a76 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,24 +1,16 @@
-cp -Rv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&

# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
"$INSTALL_ROOT/usr/bin"
-
-local PYVER=`echo ${VERSION}|cut -d . -f 1,2`
-
-if [ -d "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" ];then
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3"
-else
- cp -r "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux3" \
- "${INSTALL_ROOT}/usr/lib/python${PYVER}/plat-linux2"
-fi &&
# help some stupid installer scripts
local PV=`echo ${VERSION}|cut -c-3` &&
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
+ if [[ $SYMLINK == y ]];then
ln -sf ${TRACK_ROOT}/usr/bin/python3 ${INSTALL_ROOT}/usr/bin/python &&
ln -sf ${TRACK_ROOT}/usr/bin/python3-config
${INSTALL_ROOT}/usr/bin/python-config &&
ln -sf ${TRACK_ROOT}/usr/lib/pkgconfig/python-${PV}.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/python.pc
+ fi
fi
diff --git a/devel/python3/PRE_BUILD b/devel/python3/PRE_BUILD
deleted file mode 100755
index ee53ba4..0000000
--- a/devel/python3/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY/Lib &&
-
-cp -R plat-linux2 plat-linux3



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8b0a46492834b7f2ebd40bb6e5630142daf55dab), Treeve Jelbert, 10/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page