jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 05:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3358 from MilhouseVH/le92_python2_2to3

Browse Source 
Python2: don't install 2to3, clashes with Python3 equivalent
This commit is contained in:
Christian Hewitt 2019-03-19 19:29:11 +04:00 committed by GitHub
commit 94cfb21194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/lang/Python2/patches/Python2-2.7.11-017-dont-install-2to3.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/setup.py b/setup.py
index 69b76e7..7a50cc3 100644
--- a/setup.py
+++ b/setup.py
@@ -2315,7 +2315,6 @@ def main():
# Scripts to install
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
- 'Tools/scripts/2to3',
'Lib/smtpd.py']
)

2
scripts/build
View File

@ -448,7 +448,7 @@ done
# Transfer the new sysroot content to the shared sysroot # Transfer the new sysroot content to the shared sysroot
mkdir -p "${PKG_ORIG_SYSROOT_PREFIX}" mkdir -p "${PKG_ORIG_SYSROOT_PREFIX}"
cp -PR "${SYSROOT_PREFIX}"/* "${PKG_ORIG_SYSROOT_PREFIX}" cp -PRf "${SYSROOT_PREFIX}"/* "${PKG_ORIG_SYSROOT_PREFIX}"
rm -rf "${SYSROOT_PREFIX}" rm -rf "${SYSROOT_PREFIX}"
export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}" export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}"

2
scripts/install_addon
View File

@ -26,7 +26,7 @@ if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ]; then
if [ "$ADDON_OVERWRITE" = "yes" ]; then if [ "$ADDON_OVERWRITE" = "yes" ]; then
rm $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip rm $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip
else else
build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwrittng it. ***" build_msg "CLR_WARNING" "*** WARNING: ${PKG_ADDON_ID}-${ADDONVER}.zip already exists. Not overwriting it. ***"
exit 0 exit 0
fi fi
fi fi