mirror of
https://github.com/openwrt/packages.git
synced 2025-12-19 09:01:22 +00:00
python,python3: Increase max recursion level when generating bytecode
"python -m compileall" has a default maximum recursion level of 10, i.e. it will descend up to 10 levels of subdirectories when looking for source files to compile. This is usually sufficient but there are packages that include more than 10 levels (botocore, https://github.com/openwrt/packages/pull/8214#discussion_r270056741). This adds the "-r" command line option to the call to compileall to increase the max recursion level (currently set to 20). This also patches Python 2's compileall.py to add this max recursion level option. (Python 3's compileall.py already supports this option.) This also applies some related changes to python-package-install.sh: * Use the "-delete" option with find instead of exec'ing rm / rmdir. For the case of removing empty directories (in delete_empty_dirs()), this has the added benefit of simplifying the code, as the "-delete" option implies "-depth", and thus find "does the right thing" (removing empty directories depth-first). * Remove the backslash in "-name" patterns (for find), as they are not regular expression but glob patterns. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
This commit is contained in:
@@ -43,11 +43,7 @@ process_filespec() {
|
||||
delete_empty_dirs() {
|
||||
local dst_dir="$1"
|
||||
if [ -d "$dst_dir/usr" ] ; then
|
||||
for _ in $(seq 1 10) ; do
|
||||
find "$dst_dir/usr" -empty -type d -exec rmdir {} \; || continue
|
||||
break
|
||||
done
|
||||
rmdir "$dst_dir/usr" || true
|
||||
find "$dst_dir/usr" -empty -type d -delete
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -60,7 +56,7 @@ filespec="$6"
|
||||
|
||||
SED="${SED:-sed -e}"
|
||||
|
||||
find "$src_dir" -name "*\.exe" -exec rm -f {} \;
|
||||
find "$src_dir" -name "*.exe" -delete
|
||||
|
||||
process_filespec "$src_dir" "$dst_dir" "$filespec" || {
|
||||
echo "process filespec error-ed"
|
||||
@@ -75,7 +71,7 @@ fi
|
||||
|
||||
if [ "$mode" == "sources" ] ; then
|
||||
# Copy only python source files
|
||||
find "$dst_dir" -not -type d -not -name "*\.py" -exec rm -f {} \;
|
||||
find "$dst_dir" -not -type d -not -name "*.py" -delete
|
||||
|
||||
delete_empty_dirs "$dst_dir"
|
||||
exit 0
|
||||
@@ -83,6 +79,8 @@ fi
|
||||
|
||||
legacy=
|
||||
[ "$ver" == "3" ] && legacy="-b"
|
||||
# default max recursion is 10
|
||||
max_recursion_level=20
|
||||
|
||||
# XXX [So that you won't goof as I did]
|
||||
# Note: Yes, I tried to use the -O & -OO flags here.
|
||||
@@ -90,14 +88,14 @@ legacy=
|
||||
# So, we just stuck to un-optimized byte-codes,
|
||||
# which is still way better/faster than running
|
||||
# Python sources all the time.
|
||||
$python -m compileall $legacy -d '/' "$dst_dir" || {
|
||||
$python -m compileall -r "$max_recursion_level" $legacy -d '/' "$dst_dir" || {
|
||||
echo "python -m compileall err-ed"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Delete source files and pyc [ un-optimized bytecode files ]
|
||||
# We may want to make this optimization thing configurable later, but not sure atm
|
||||
find "$dst_dir" -type f -name "*\.py" -exec rm -f {} \;
|
||||
find "$dst_dir" -type f -name "*.py" -delete
|
||||
|
||||
delete_empty_dirs "$dst_dir"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user