diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-01-23 18:29:17 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 18:29:17 +1000 |
| commit | 726479026b536a3e959c1d0c006c2451588e975d (patch) | |
| tree | 9c06da454b418ebc19a7ca68fbc09c092f9e5050 /tools | |
| parent | 724091127f4cb64269ef43bd790ced2778a84cfc (diff) | |
| parent | be239ea149de3ce31b01f71e414c671a202496ac (diff) | |
Merge pull request #24551 from fuzzard/depends_pycryptodome_fix
[tools/depends] Fix android pycryptodome package, Bump rustup 1.75.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/packaging/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/depends/native/rustup/Makefile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in index aed14a1265..d7a09fe017 100644 --- a/tools/android/packaging/Makefile.in +++ b/tools/android/packaging/Makefile.in @@ -83,8 +83,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so find $(PREFIX)/share/@APP_NAME_LC@/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true find $(DEPENDS_PATH)/share/kodi/addons -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true find $(PREFIX)/lib/@APP_NAME_LC@/system -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; - DIR=${CURDIR}; cd $(PREFIX)/lib/python@PYTHON_VERSION@/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_"` ;cp $$i $$DIR/xbmc/obj/local/$(CPU)/$$FN ; done - find $(PREFIX)/lib/python@PYTHON_VERSION@/site-packages/PIL -name "*.so" -exec cp -fp {} xbmc/obj/local/$(CPU)/ \; || true + DIR=${CURDIR}; cd $(PREFIX)/lib/python@PYTHON_VERSION@/site-packages; for i in `find Cryptodome -name \*.so` ; do FN=`echo $$i | cut -c1- | tr "/" "_" | sed -e 's/\.abi[0-9]\\././'` ;cp $$i $$DIR/xbmc/obj/local/$(CPU)/$$FN ; done cd xbmc/obj/local/$(CPU)/; find . -name "*.so" -not -name "lib*.so" | sed "s/\.\///" | xargs -I@ mv @ lib@ cp -fp xbmc/obj/local/$(CPU)/*.so xbmc/lib/$(CPU)/ $(STRIP) --strip-unneeded xbmc/lib/$(CPU)/*.so diff --git a/tools/depends/native/rustup/Makefile b/tools/depends/native/rustup/Makefile index 0c699b952d..6930764eb4 100644 --- a/tools/depends/native/rustup/Makefile +++ b/tools/depends/native/rustup/Makefile @@ -9,7 +9,7 @@ APP=$(PLATFORM)/bin/$(APPNAME) export RUSTUP_HOME=$(PREFIX)/.rustup export CARGO_HOME=$(PREFIX)/.cargo -RUST_TOOLCHAIN_VERSION=1.71.0 +RUST_TOOLCHAIN_VERSION=1.75.0 RUSTUP_ENV_VARS = RUSTUP_HOME=$(PREFIX)/.rustup \ CARGO_HOME=$(PREFIX)/.cargo RUSTUP = $(RUSTUP_ENV_VARS) $(PREFIX)/bin/rustup |