summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Cook2012-01-14 11:47:41 -0600
committerVlad Glagolev2012-04-26 13:39:56 +0400
commit448d4d1bf1b0957c560a3f04910618d9afed4fbd (patch)
treecdf5e4a26c8667942a29b5a6beb3b11876ecf0cb
parent83e70da60a681a83eb9e0680ca8a555faf2c0c7c (diff)
python: https://bugs.gentoo.org/374579 to fix installs by some python spells.
(cherry picked from commit eb13990ae410ed2cfa5d428297f648f216a6810e)
-rw-r--r--devel/python/HISTORY5
-rwxr-xr-xdevel/python/INSTALL11
-rwxr-xr-xdevel/python/PRE_BUILD4
3 files changed, 20 insertions, 0 deletions
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index 58fbb6db15..d55bb20d1c 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,8 @@
+2012-01-14 Robin Cook <rcook@wyrms.net>
+ * PRE_BUILD: added to fix linux2/linux3 issue
+ * INSTALL: added copying of plat directory
+ https://bugs.gentoo.org/374579
+
2011-10-23 Vlad Glagolev <stealth@sourcemage.org>
* PROVIDES: added, provides PYTHON
diff --git a/devel/python/INSTALL b/devel/python/INSTALL
index a205210a49..86ae17c4a8 100755
--- a/devel/python/INSTALL
+++ b/devel/python/INSTALL
@@ -7,3 +7,14 @@ fi &&
# 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
+
diff --git a/devel/python/PRE_BUILD b/devel/python/PRE_BUILD
new file mode 100755
index 0000000000..ee53ba4f3b
--- /dev/null
+++ b/devel/python/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/Lib &&
+
+cp -R plat-linux2 plat-linux3