mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #3358 from MilhouseVH/le92_python2_2to3
Python2: don't install 2to3, clashes with Python3 equivalent
This commit is contained in:
commit
94cfb21194
@ -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']
|
||||
)
|
||||
|
@ -448,7 +448,7 @@ done
|
||||
|
||||
# Transfer the new sysroot content to the shared sysroot
|
||||
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}"
|
||||
|
||||
export SYSROOT_PREFIX="${PKG_ORIG_SYSROOT_PREFIX}"
|
||||
|
@ -26,7 +26,7 @@ if [ -f $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip ]; then
|
||||
if [ "$ADDON_OVERWRITE" = "yes" ]; then
|
||||
rm $ADDON_INSTALL_DIR/$PKG_ADDON_ID-$ADDONVER.zip
|
||||
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
|
||||
fi
|
||||
fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user