*: Fix on-the-fly patching for Rust packages

%ci:no-build
This commit is contained in:
Tee KOBAYASHI 2023-06-15 21:32:58 +09:00 committed by xtkoba
parent 9d17fe0cb1
commit 7ad32b4bd6
22 changed files with 31 additions and 31 deletions

View File

@ -25,7 +25,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
local f
for f in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done
}

View File

@ -25,13 +25,13 @@ termux_step_pre_configure() {
cargo fetch --target $CARGO_TARGET_NAME
local d p
for d in $CARGO_HOME/registry/src/github.com-*/libbpf-sys-*; do
for d in $CARGO_HOME/registry/src/*/libbpf-sys-*; do
for p in libbpf-sys-0.6.0-1-libbpf-include-linux-{compiler,types}.h.diff; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
done
done
for d in $CARGO_HOME/registry/src/github.com-*/nix-*; do
for d in $CARGO_HOME/registry/src/*/nix-*; do
for p in nix-{0.22.0,0.23.1}-src-sys-statfs.rs.diff; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :

View File

@ -18,7 +18,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
local f
for f in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done
}

View File

@ -21,7 +21,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
local f
for f in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done

View File

@ -23,12 +23,12 @@ termux_step_pre_configure() {
local d
local p=termios-0.2.2.diff
for d in $CARGO_HOME/registry/src/github.com-*/termios-0.2.2; do
for d in $CARGO_HOME/registry/src/*/termios-0.2.2; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
done
p=service-manager-0.2.0.diff
for d in $CARGO_HOME/registry/src/github.com-*/service-manager-*; do
for d in $CARGO_HOME/registry/src/*/service-manager-*; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
done

View File

@ -19,7 +19,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
local f
for f in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done

View File

@ -17,7 +17,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/trust-dns-resolver-*; do
for d in $CARGO_HOME/registry/src/*/trust-dns-resolver-*; do
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \
$TERMUX_PKG_BUILDER_DIR/trust-dns-resolver.diff \
| patch --silent -p1 -d ${d} || :

View File

@ -28,7 +28,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
local f
for f in $CARGO_HOME/registry/src/index.crates.io-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done
}

View File

@ -34,7 +34,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/trust-dns-resolver-*; do
for d in $CARGO_HOME/registry/src/*/trust-dns-resolver-*; do
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \
$TERMUX_PKG_BUILDER_DIR/trust-dns-resolver.diff \
| patch --silent -p1 -d ${d} || :

View File

@ -18,7 +18,7 @@ termux_step_pre_configure() {
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/trust-dns-resolver-*; do
for d in $CARGO_HOME/registry/src/*/trust-dns-resolver-*; do
sed -e "s|@TERMUX_PREFIX@|$TERMUX_PREFIX|" \
$TERMUX_PKG_BUILDER_DIR/trust-dns-resolver.diff \
| patch --silent -p1 -d ${d} || :

View File

@ -31,7 +31,7 @@ termux_step_pre_configure() {
local _patch=$TERMUX_PKG_BUILDER_DIR/filetime-src-unix-utimes.rs.diff
local d
for d in $CARGO_HOME/registry/src/github.com-*/filetime-*; do
for d in $CARGO_HOME/registry/src/*/filetime-*; do
patch --silent -p1 -d ${d} < ${_patch} || :
done
}

View File

@ -32,7 +32,7 @@ termux_step_pre_configure() {
local _patch=$TERMUX_PKG_BUILDER_DIR/mdbook-src-renderer-html_handlebars-helpers-navigation.rs.diff
local d
for d in $CARGO_HOME/registry/src/github.com-*/mdbook-*; do
for d in $CARGO_HOME/registry/src/*/mdbook-*; do
patch --silent -p1 -d ${d} < ${_patch} || :
done
}

View File

@ -17,7 +17,7 @@ termux_step_pre_configure() {
local _patch=$TERMUX_PKG_BUILDER_DIR/mdbook-src-renderer-html_handlebars-helpers-navigation.rs.diff
local d
for d in $CARGO_HOME/registry/src/github.com-*/mdbook-*; do
for d in $CARGO_HOME/registry/src/*/mdbook-*; do
patch --silent -p1 -d ${d} < ${_patch} || :
done
}

View File

@ -17,7 +17,7 @@ termux_step_pre_configure() {
local _patch=$TERMUX_PKG_BUILDER_DIR/mdbook-src-renderer-html_handlebars-helpers-navigation.rs.diff
local d
for d in $CARGO_HOME/registry/src/github.com-*/mdbook-*; do
for d in $CARGO_HOME/registry/src/*/mdbook-*; do
patch --silent -p1 -d ${d} < ${_patch} || :
done
}

View File

@ -16,13 +16,13 @@ termux_step_pre_configure() {
: "${CARGO_HOME:=$HOME/.cargo}"
export CARGO_HOME
rm -rf $CARGO_HOME/registry/src/github.com-*/socket2-*
rm -rf $CARGO_HOME/registry/src/*/socket2-*
cargo fetch --target "${CARGO_TARGET_NAME}"
if [ $TERMUX_ARCH_BITS = 32 ]; then
local p="socket2-0.5.2-src-sys-unix.rs.diff32"
local d
for d in $CARGO_HOME/registry/src/github.com-*/socket2-*; do
for d in $CARGO_HOME/registry/src/*/socket2-*; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
done

View File

@ -30,10 +30,10 @@ termux_step_pre_configure() {
: "${CARGO_HOME:=$HOME/.cargo}"
export CARGO_HOME
rm -rf $CARGO_HOME/registry/src/github.com-*/pwd-*
rm -rf $CARGO_HOME/registry/src/*/pwd-*
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/pwd-*; do
for d in $CARGO_HOME/registry/src/*/pwd-*; do
patch --silent -p1 -d ${d} < $TERMUX_PKG_BUILDER_DIR/crates-pwd-for-android.diff || :
done

View File

@ -18,20 +18,20 @@ termux_step_pre_configure() {
: "${CARGO_HOME:=$HOME/.cargo}"
export CARGO_HOME
rm -rf "${CARGO_HOME}"/registry/src/github.com-*/git-config*
rm -rf $CARGO_HOME/registry/src/github.com-*/rustix-*
rm -rf "${CARGO_HOME}"/registry/src/*/git-config*
rm -rf $CARGO_HOME/registry/src/*/rustix-*
cargo fetch --target "${CARGO_TARGET_NAME}"
for d in $CARGO_HOME/registry/src/github.com-*/rustix-*; do
for d in $CARGO_HOME/registry/src/*/rustix-*; do
patch --silent -p1 -d ${d} < $TERMUX_PKG_BUILDER_DIR/0001-upstream-fix-libc-removing-unsafe-on-makedev.diff || :
done
for d in $CARGO_HOME/registry/src/github.com-*/git-config*; do
for d in $CARGO_HOME/registry/src/*/git-config*; do
patch --silent -p1 -d ${d} < $TERMUX_PKG_BUILDER_DIR/0002-rust-git-config-path.diff || :
done
local f
for f in $CARGO_HOME/registry/src/github.com-*/libgit2-sys-*/build.rs; do
for f in $CARGO_HOME/registry/src/*/libgit2-sys-*/build.rs; do
sed -i -E 's/\.range_version\(([^)]*)\.\.[^)]*\)/.atleast_version(\1)/g' "${f}"
done
}

View File

@ -69,7 +69,7 @@ termux_step_configure() {
termux_step_make() {
cargo fetch --target $CARGO_TARGET_NAME
patch --silent -p1 \
-d $CARGO_HOME/registry/src/github.com-*/parity-rocksdb-sys-0.5.6/rocksdb \
-d $CARGO_HOME/registry/src/*/parity-rocksdb-sys-0.5.6/rocksdb \
< $TERMUX_PKG_BUILDER_DIR/parity-rocksdb-sys-0.5.6-mutex.diff
cargo build --jobs $TERMUX_MAKE_PROCESSES --target $CARGO_TARGET_NAME --release --features final
for applet in evmbin ethstore-cli ethkey-cli; do

View File

@ -33,7 +33,7 @@ termux_step_pre_configure() {
local _patch=$TERMUX_PKG_BUILDER_DIR/tikv-jemalloc-sys-0.5.3+5.3.0-patched-src-lib.rs.diff
local d
for d in $CARGO_HOME/registry/src/index.crates.io-*/tikv-jemalloc-sys-*; do
for d in $CARGO_HOME/registry/src/*/tikv-jemalloc-sys-*; do
patch --silent -p1 -d ${d} < ${_patch} || :
done
}

View File

@ -20,7 +20,7 @@ termux_step_pre_configure() {
local p="cmake-0.1.50-src-lib.rs.diff"
local d
for d in $CARGO_HOME/registry/src/index.crates.io-*/cmake-*; do
for d in $CARGO_HOME/registry/src/*/cmake-*; do
patch --silent -p1 -d ${d} \
< "$TERMUX_PKG_BUILDER_DIR/${p}" || :
done

View File

@ -28,10 +28,10 @@ termux_step_pre_configure() {
a7cbd6674191c93ed82c87da7173366b7f56c5998a650b1054de4e4fa3974d69
echo "Applying $(dirname "${p}")"
local d
for d in $CARGO_HOME/registry/src/github.com-*/libmpv-sys-*; do
for d in $CARGO_HOME/registry/src/*/libmpv-sys-*; do
patch --silent -f -p2 -d ${d} < "${p}" || :
done
for d in $CARGO_HOME/registry/src/github.com-*/libmpv-[0-9]*; do
for d in $CARGO_HOME/registry/src/*/libmpv-[0-9]*; do
patch --silent -f -p1 -d ${d} < "${p}" || :
done
}

View File

@ -23,7 +23,7 @@ termux_step_pre_configure() {
local p=$TERMUX_PKG_BUILDER_DIR/webkit2gtk-sys.diff
local d
for d in $CARGO_HOME/registry/src/github.com-*/webkit2gtk-sys-*; do
for d in $CARGO_HOME/registry/src/*/webkit2gtk-sys-*; do
echo "Applying $(basename ${p}) to $(basename ${d})"
patch --silent -p1 -d ${d} < ${p} || :
done