From 1b58564eadc71618ebea85ea1e955d6caa92d63a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 24 Oct 2019 22:51:28 +0100
Subject: [PATCH] packages: use Python helper functions

---
 packages/lang/Python3/package.mk                   | 3 +--
 packages/mediacenter/LibreELEC-settings/package.mk | 6 ++----
 packages/mediacenter/kodi/package.mk               | 3 +++
 packages/python/devel/pygobject/package.mk         | 2 +-
 packages/python/graphics/Pillow/package.mk         | 2 +-
 packages/python/security/pycryptodome/package.mk   | 2 +-
 packages/python/system/dbus-python/package.mk      | 2 +-
 packages/python/system/simplejson/package.mk       | 3 ++-
 packages/x11/proto/xcb-proto/package.mk            | 4 ++++
 9 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk
index 2b10120892..42ce3d0f22 100644
--- a/packages/lang/Python3/package.mk
+++ b/packages/lang/Python3/package.mk
@@ -128,8 +128,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/python*-config
   rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.*
 
-  $TOOLCHAIN/bin/python3 -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py -d ${PKG_INSTALL_PATH_LIB#${INSTALL}} -b -f $PKG_INSTALL_PATH_LIB
-  find $PKG_INSTALL_PATH_LIB -name "*.py" -exec rm -f {} \; &>/dev/null
+  python_compile $PKG_INSTALL_PATH_LIB
 
   # strip
   chmod u+w $INSTALL/usr/lib/libpython*.so.*
diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk
index 2524445e51..10c5b72e95 100644
--- a/packages/mediacenter/LibreELEC-settings/package.mk
+++ b/packages/mediacenter/LibreELEC-settings/package.mk
@@ -25,11 +25,9 @@ post_makeinstall_target() {
 
   ADDON_INSTALL_DIR=$INSTALL/usr/share/kodi/addons/service.libreelec.settings
 
-  $TOOLCHAIN/bin/python -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py $ADDON_INSTALL_DIR/resources/lib/ -f
-  rm -rf $(find $ADDON_INSTALL_DIR/resources/lib/ -name "*.py")
+  python_compile $ADDON_INSTALL_DIR/resources/lib/
 
-  $TOOLCHAIN/bin/python -Wi -t -B $TOOLCHAIN/lib/$PKG_PYTHON_VERSION/compileall.py $ADDON_INSTALL_DIR/oe.py -f
-  rm -rf $ADDON_INSTALL_DIR/oe.py
+  python_compile $ADDON_INSTALL_DIR/oe.py
 }
 
 post_install() {
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 6fe21f21f0..51e18ee285 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -352,6 +352,9 @@ post_makeinstall_target() {
       cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/kodi/media/Fonts
   fi
 
+  # Compile kodi Python site-packages to .pyc bytecode, and remove .py source code
+  python_compile $INSTALL/usr/lib/$PKG_PYTHON_VERSION/site-packages/kodi
+
   debug_strip $INSTALL/usr/lib/kodi/kodi.bin
 }
 
diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk
index dbc746c5a8..6c79fd9a81 100644
--- a/packages/python/devel/pygobject/package.mk
+++ b/packages/python/devel/pygobject/package.mk
@@ -19,7 +19,7 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  python_remove_source
 
   rm -rf $INSTALL/usr/bin
   rm -rf $INSTALL/usr/share/pygobject
diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk
index e08e1555e0..eb069f11d2 100644
--- a/packages/python/graphics/Pillow/package.mk
+++ b/packages/python/graphics/Pillow/package.mk
@@ -26,7 +26,7 @@ makeinstall_target() {
 }
 
 post_makeinstall_target() {
-  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  python_remove_source
 
   rm -rf $INSTALL/usr/bin
 }
diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk
index 5425ba884a..2971f0c71f 100644
--- a/packages/python/security/pycryptodome/package.mk
+++ b/packages/python/security/pycryptodome/package.mk
@@ -35,5 +35,5 @@ makeinstall_target() {
 }
 
 post_makeinstall_target() {
-  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  python_remove_source
 }
diff --git a/packages/python/system/dbus-python/package.mk b/packages/python/system/dbus-python/package.mk
index 7deba69fec..5dababd16d 100644
--- a/packages/python/system/dbus-python/package.mk
+++ b/packages/python/system/dbus-python/package.mk
@@ -19,5 +19,5 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  python_remove_source
 }
diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk
index 937e28c25b..aaed33ccc8 100644
--- a/packages/python/system/simplejson/package.mk
+++ b/packages/python/system/simplejson/package.mk
@@ -25,6 +25,7 @@ makeinstall_target() {
 }
 
 post_makeinstall_target() {
-  find $INSTALL/usr/lib -name "*.py" -exec rm -rf "{}" ";"
+  python_remove_source
+
   rm -rf $INSTALL/usr/lib/python*/site-packages/*/tests
 }
diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk
index 1e631762dc..3b9656188f 100644
--- a/packages/x11/proto/xcb-proto/package.mk
+++ b/packages/x11/proto/xcb-proto/package.mk
@@ -10,3 +10,7 @@ PKG_SITE="http://www.X.org"
 PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain util-macros Python3:host"
 PKG_LONGDESC="X C-language Bindings protocol headers."
+
+post_makeinstall_target() {
+  python_remove_source
+}