Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0 Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

starship: add workarounds for arm64 and x86

Browse Source
This commit is contained in:
Jeremy Drake committed 2023-07-30 16:40:30 -07:00
1 parent 1c70a91b41
commit d73f456b73
3 files changed
+78 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mingw-w64-starship/PKGBUILD
+24 -7
View File
@@ -4,26 +4,43 @@ _realname=starship
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.16.0
pkgrel=1
pkgrel=2
pkgdesc="The cross-shell prompt for astronauts (mingw-w64)"
arch=('any')
# i686 is disabled, see
# https://github.com/msys2/MINGW-packages/pull/17831#issuecomment-1648392525
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url="https://starship.rs"
license=('spdx:ISC')
depends=("${MINGW_PACKAGE_PREFIX}-libgit2")
makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
"${MINGW_PACKAGE_PREFIX}-cmake")
options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/starship/starship/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('133888e190ce1563927e16ee693da3026d2e668d975ac373f853e030743775c5')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/starship/starship/archive/refs/tags/v${pkgver}.tar.gz"
"windows-0.39.0-gnullvm.patch"
"sha1-asm-x86-windows.patch")
sha256sums=('133888e190ce1563927e16ee693da3026d2e668d975ac373f853e030743775c5'
'fa217d67779706fd504e0cdce654e9bc8b15c2f29e5e3c9d62219637c51d32a8'
'2c76c732e3b132af905e31732a729158ea1b1f3cf1c275a882d5349157c34835')
noextract=("${_realname}-${pkgver}.tar.gz")
prepare() {
tar -xzf "${srcdir}"/${_realname}-${pkgver}.tar.gz -C ${srcdir} || true
cd "${srcdir}/${_realname}-${pkgver}"
"${MINGW_PREFIX}/bin/cargo.exe" fetch --locked
cargo vendor \
--locked \
--versioned-dirs
mkdir -p .cargo
cat >> .cargo/config.toml <<END
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "vendor"
END
patch -Nbp1 -i "${srcdir}/windows-0.39.0-gnullvm.patch"
patch -Nbp1 -i "${srcdir}/sha1-asm-x86-windows.patch"
}
build() {
mingw-w64-starship/sha1-asm-x86-windows.patch
+18
View File
@@ -0,0 +1,18 @@
--- starship-1.16.0/vendor/sha1-asm-0.5.1/src/x86.S.orig 2023-07-30 22:48:50.100361700 +0000
+++ starship-1.16.0/vendor/sha1-asm-0.5.1/src/x86.S 2023-07-30 22:49:21.819680700 +0000
@@ -23,7 +23,7 @@
/* void sha1_compress(uint32_t state[5], const uint8_t block[64]) */
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(_WIN32)
.globl _sha1_compress
_sha1_compress:
#else
--- starship-1.16.0/vendor/sha1-asm-0.5.1/.cargo-checksum.json.orig 2023-07-30 22:49:52.725380200 +0000
+++ starship-1.16.0/vendor/sha1-asm-0.5.1/.cargo-checksum.json 2023-07-30 22:50:04.991044100 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"031d14bca77dcdcbc19ac505b5a50990b2684dcc32e144d56b84efe738a069c1","Cargo.toml":"e993e6f1f31f1202d5379d55c07b45e8211ecc2ace0eb0baabb9a96f30877e7d","LICENSE":"bb0f0c66a472941c540cca118ea7c7a049fc3a41122d9e608265d842e8529268","benches/lib.rs":"57651d9a2e9c4223e276699917e14f89881516360ec81f8d4d4e00f2fb9deff4","build.rs":"04280d26b70e4568738251ae9a311b1bdd016982893dae3c06d91cd33083bb84","src/aarch64.S":"893ebb91b83342f1628db1a4c532b1d6b521f200893c85b62cc859d31916fca4","src/aarch64_apple.S":"6152301dc8e242815a5587e156b2206ca498158745f83bc1c1f7e76f92186e4d","src/lib.rs":"ef500159eac38066a07a6186bf65355afd89d2ec1c988500b9b00599c839c53e","src/x64.S":"0e4850e2492b10d5e27c6eb5df25a9613f5c49964ff71cf79ce145ea3bb4cde9","src/x86.S":"e8aaf8b1af7e4b9a5784fb9baab99bdb2d208ac0d2468a95e3a0607203dea107"},"package":"563d4f7100bc3fce234e5f37bbf63dc2752558964505ba6ac3f7204bdc59eaac"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"031d14bca77dcdcbc19ac505b5a50990b2684dcc32e144d56b84efe738a069c1","Cargo.toml":"e993e6f1f31f1202d5379d55c07b45e8211ecc2ace0eb0baabb9a96f30877e7d","LICENSE":"bb0f0c66a472941c540cca118ea7c7a049fc3a41122d9e608265d842e8529268","benches/lib.rs":"57651d9a2e9c4223e276699917e14f89881516360ec81f8d4d4e00f2fb9deff4","build.rs":"04280d26b70e4568738251ae9a311b1bdd016982893dae3c06d91cd33083bb84","src/aarch64.S":"893ebb91b83342f1628db1a4c532b1d6b521f200893c85b62cc859d31916fca4","src/aarch64_apple.S":"6152301dc8e242815a5587e156b2206ca498158745f83bc1c1f7e76f92186e4d","src/lib.rs":"ef500159eac38066a07a6186bf65355afd89d2ec1c988500b9b00599c839c53e","src/x64.S":"0e4850e2492b10d5e27c6eb5df25a9613f5c49964ff71cf79ce145ea3bb4cde9","src/x86.S":"c61f276ceac7983b35a0122382b97f66e09689d689dcb9041e25fc7a727f9f9c"},"package":"563d4f7100bc3fce234e5f37bbf63dc2752558964505ba6ac3f7204bdc59eaac"}
\ No newline at end of file
mingw-w64-starship/windows-0.39.0-gnullvm.patch
+36
View File
@@ -0,0 +1,36 @@
--- starship-1.16.0/vendor/windows-0.39.0/Cargo.toml.orig 2023-07-30 22:26:42.349337500 +0000
+++ starship-1.16.0/vendor/windows-0.39.0/Cargo.toml 2023-07-30 22:27:13.927475400 +0000
@@ -707,6 +707,9 @@
implement = ["windows-implement"]
interface = ["windows-interface"]
+[target.aarch64-pc-windows-gnullvm.dependencies.windows_aarch64_msvc]
+version = "0.39.0"
+
[target.aarch64-pc-windows-msvc.dependencies.windows_aarch64_msvc]
version = "0.39.0"
--- starship-1.16.0/vendor/windows-0.39.0/.cargo-checksum.json.bak 2023-07-30 22:27:19.271206600 +0000
+++ starship-1.16.0/vendor/windows-0.39.0/.cargo-checksum.json 2023-07-30 22:29:16.536830700 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"38e02cbdd87e83d0b8e2928213da77e25624e5f3ac873a2ee80a27a755fc804c","license-apache-2.0":"c16f8dcf1a368b83be78d826ea23de4079fe1b4469a0ab9ee20563f37ff3d44b","license-mit":"c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383","readme.md":"c5db8ff559f6968038c3af38d30544cfd216a0c843260086534d70b49a194866","src/Windows/AI/MachineLearning/Preview/impl.rs":"cdebe93540bbd4c0e5cd1c557c1568c26f13d4da85a6346d62f97330e4eb76ec","src/Windows/AI/MachineLearning/Preview/mod.rs":"7205ebbfdd08087919fe2514838ed6811b99f9c8ba90c97de1e04e50bda81086","src/Windows/AI/MachineLearning/impl.rs":"b6018d853c4db41d7e55f7b37ae8b6cff8aaea05f2aaf0bb986894da4a2376ad","src/Windows/AI/MachineLearning/mod.rs":"08b7b3e12f593765d95a2257de6a992323cfcc3c3dd08c9c8a8c7a3eaa441488","src/Windows/AI/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/AI/mod.rs":"cca4e535a0ed0e4e54f8be2130228c79b0b6d69a7a20ef5890bb6e728e1c762c","src/Windows/ApplicationModel/Activation/impl.rs":"1491ea8e66268eda32579ee38c49c7917ca6c79741fd6bd18b24c38b60b3d15a","src/Windows/ApplicationModel/Activation/mod.rs":"dbc498140cb62baaf68da57125ac54e7b4b848b74b15a8f13b320750282716ed","src/Windows/ApplicationModel/AppExtensions/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/AppExtensions/mod.rs":"f21f24bc005ff38fd0ee1e07c3358b2a7bbfb64d03cad949b16e4dba71b79759","src/Windows/ApplicationModel/AppService/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/AppService/mod.rs":"af52173d58df42baeeea9f3dd3976c896106a80c2da8ea4006047875f78cec10","src/Windows/ApplicationModel/Appointments/AppointmentsProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Appointments/AppointmentsProvider/mod.rs":"703497d194cb358ed7ce428593b73ae28de6952a81d3fb72de1086d248ca0c7c","src/Windows/ApplicationModel/Appointments/DataProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Appointments/DataProvider/mod.rs":"cca4225093081a14e6a1bb6624173fea2caa8c577dcc3d8c19339c669b0d919b","src/Windows/ApplicationModel/Appointments/impl.rs":"435f9aac8757379687231207b481c2213c17a76f60f8c1621c1e48fdfb61abd8","src/Windows/ApplicationModel/Appointments/mod.rs":"61ebcddaad56d83013ad8493c9bd445ed296a1061a7861a9bdd90923c3fb0edc","src/Windows/ApplicationModel/Background/impl.rs":"8ad6fbbd8f437f6095db507ebc45e48a8597b25fc246f8a041a5b2b405f2a382","src/Windows/ApplicationModel/Background/mod.rs":"95d8e49bbfb47678bfdd481783ce75a1673bf4c1eddf4ee40a93ff95a26c9427","src/Windows/ApplicationModel/Calls/Background/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/Background/mod.rs":"d7ac2df36778fe86d40869c310650860911ef8550a03e6b1d1aedc334b23eb5d","src/Windows/ApplicationModel/Calls/Provider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/Provider/mod.rs":"6110253f99dd93d862b23194cce50865933a14f8a1618fe16d6fda3e4d849a09","src/Windows/ApplicationModel/Calls/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/mod.rs":"e7ecd10808cd22224e0aef6f318f0461ef1be82e9df4eb5de7068caff1b1bd8f","src/Windows/ApplicationModel/Chat/impl.rs":"7edf77d45d2d4673c1ee4e9082366d678a89a1371ccf07894976dfd109d66870","src/Windows/ApplicationModel/Chat/mod.rs":"fbf511323f94483e9658fc2b754d0201147401d5fe3c9f91f90ca4e9125b35ea","src/Windows/ApplicationModel/CommunicationBlocking/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/CommunicationBlocking/mod.rs":"67009d377d1888b41afe60ca101ff8e4e5ee1080c03769561d458bd5d3b61e73","src/Windows/ApplicationModel/Contacts/DataProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Contacts/DataProvider/mod.rs":"fd477efad3752371a47d1b03dd0c541a99d6516e523e10ad9cb877b802a03900","src/Windows/ApplicationModel/Contacts/Provider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Contacts/Provider/mod.rs":"105cc4b945e2ddb780a0d904a1142f38e46d4070d55ff8e88a68cf9e680ce68d","src/Windows/ApplicationModel/Contacts/impl.rs":"d41db9d0c53fa940f1fa60a28ef84a27e9f57c33dc217e5d6f25cdc6e8c1f1ea","src/Windows/ApplicationModel/Contacts/mod.rs":"bbcd2984cd7c406001271763eb55bdafd24c8e498cf6e7204994019aa5162598","src/Windows/ApplicationModel/ConversationalAgent/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/ConversationalAgent/mod.rs":"781c02f570ebdce53da8cbc7ab37d7d0a1856a5d551b0d0e6138d361c489cb0c","src/Windows/ApplicationModel/Core/impl.rs":"1657ee89035c47075330acfa86e864f7e9516b237a59630d1947b3fa20744191","src/Windows/ApplicationModel/Core/m Line truncated
\ No newline at end of file
+{"files":{"Cargo.toml":"31b22193a0be116860c192c6b1a117538e10ce9080335cb365400597c3726588","license-apache-2.0":"c16f8dcf1a368b83be78d826ea23de4079fe1b4469a0ab9ee20563f37ff3d44b","license-mit":"c2cfccb812fe482101a8f04597dfc5a9991a6b2748266c47ac91b6a5aae15383","readme.md":"c5db8ff559f6968038c3af38d30544cfd216a0c843260086534d70b49a194866","src/Windows/AI/MachineLearning/Preview/impl.rs":"cdebe93540bbd4c0e5cd1c557c1568c26f13d4da85a6346d62f97330e4eb76ec","src/Windows/AI/MachineLearning/Preview/mod.rs":"7205ebbfdd08087919fe2514838ed6811b99f9c8ba90c97de1e04e50bda81086","src/Windows/AI/MachineLearning/impl.rs":"b6018d853c4db41d7e55f7b37ae8b6cff8aaea05f2aaf0bb986894da4a2376ad","src/Windows/AI/MachineLearning/mod.rs":"08b7b3e12f593765d95a2257de6a992323cfcc3c3dd08c9c8a8c7a3eaa441488","src/Windows/AI/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/AI/mod.rs":"cca4e535a0ed0e4e54f8be2130228c79b0b6d69a7a20ef5890bb6e728e1c762c","src/Windows/ApplicationModel/Activation/impl.rs":"1491ea8e66268eda32579ee38c49c7917ca6c79741fd6bd18b24c38b60b3d15a","src/Windows/ApplicationModel/Activation/mod.rs":"dbc498140cb62baaf68da57125ac54e7b4b848b74b15a8f13b320750282716ed","src/Windows/ApplicationModel/AppExtensions/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/AppExtensions/mod.rs":"f21f24bc005ff38fd0ee1e07c3358b2a7bbfb64d03cad949b16e4dba71b79759","src/Windows/ApplicationModel/AppService/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/AppService/mod.rs":"af52173d58df42baeeea9f3dd3976c896106a80c2da8ea4006047875f78cec10","src/Windows/ApplicationModel/Appointments/AppointmentsProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Appointments/AppointmentsProvider/mod.rs":"703497d194cb358ed7ce428593b73ae28de6952a81d3fb72de1086d248ca0c7c","src/Windows/ApplicationModel/Appointments/DataProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Appointments/DataProvider/mod.rs":"cca4225093081a14e6a1bb6624173fea2caa8c577dcc3d8c19339c669b0d919b","src/Windows/ApplicationModel/Appointments/impl.rs":"435f9aac8757379687231207b481c2213c17a76f60f8c1621c1e48fdfb61abd8","src/Windows/ApplicationModel/Appointments/mod.rs":"61ebcddaad56d83013ad8493c9bd445ed296a1061a7861a9bdd90923c3fb0edc","src/Windows/ApplicationModel/Background/impl.rs":"8ad6fbbd8f437f6095db507ebc45e48a8597b25fc246f8a041a5b2b405f2a382","src/Windows/ApplicationModel/Background/mod.rs":"95d8e49bbfb47678bfdd481783ce75a1673bf4c1eddf4ee40a93ff95a26c9427","src/Windows/ApplicationModel/Calls/Background/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/Background/mod.rs":"d7ac2df36778fe86d40869c310650860911ef8550a03e6b1d1aedc334b23eb5d","src/Windows/ApplicationModel/Calls/Provider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/Provider/mod.rs":"6110253f99dd93d862b23194cce50865933a14f8a1618fe16d6fda3e4d849a09","src/Windows/ApplicationModel/Calls/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Calls/mod.rs":"e7ecd10808cd22224e0aef6f318f0461ef1be82e9df4eb5de7068caff1b1bd8f","src/Windows/ApplicationModel/Chat/impl.rs":"7edf77d45d2d4673c1ee4e9082366d678a89a1371ccf07894976dfd109d66870","src/Windows/ApplicationModel/Chat/mod.rs":"fbf511323f94483e9658fc2b754d0201147401d5fe3c9f91f90ca4e9125b35ea","src/Windows/ApplicationModel/CommunicationBlocking/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/CommunicationBlocking/mod.rs":"67009d377d1888b41afe60ca101ff8e4e5ee1080c03769561d458bd5d3b61e73","src/Windows/ApplicationModel/Contacts/DataProvider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Contacts/DataProvider/mod.rs":"fd477efad3752371a47d1b03dd0c541a99d6516e523e10ad9cb877b802a03900","src/Windows/ApplicationModel/Contacts/Provider/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/Contacts/Provider/mod.rs":"105cc4b945e2ddb780a0d904a1142f38e46d4070d55ff8e88a68cf9e680ce68d","src/Windows/ApplicationModel/Contacts/impl.rs":"d41db9d0c53fa940f1fa60a28ef84a27e9f57c33dc217e5d6f25cdc6e8c1f1ea","src/Windows/ApplicationModel/Contacts/mod.rs":"bbcd2984cd7c406001271763eb55bdafd24c8e498cf6e7204994019aa5162598","src/Windows/ApplicationModel/ConversationalAgent/impl.rs":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/Windows/ApplicationModel/ConversationalAgent/mod.rs":"781c02f570ebdce53da8cbc7ab37d7d0a1856a5d551b0d0e6138d361c489cb0c","src/Windows/ApplicationModel/Core/impl.rs":"1657ee89035c47075330acfa86e864f7e9516b237a59630d1947b3fa20744191","src/Windows/ApplicationModel/Core/m Line truncated
\ No newline at end of file
--- starship-1.16.0/vendor/windows_aarch64_msvc-0.39.0/build.rs.orig 2023-07-30 22:29:59.021428700 +0000
+++ starship-1.16.0/vendor/windows_aarch64_msvc-0.39.0/build.rs 2023-07-30 22:30:28.271497000 +0000
@@ -1,6 +1,6 @@
fn main() {
let target = std::env::var("TARGET").unwrap();
- if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" {
+ if target != "aarch64-pc-windows-msvc" && target != "aarch64-uwp-windows-msvc" && target != "aarch64-pc-windows-gnullvm" {
return;
}
--- starship-1.16.0/vendor/windows_aarch64_msvc-0.39.0/.cargo-checksum.json.orig 2023-07-30 22:30:56.224568200 +0000
+++ starship-1.16.0/vendor/windows_aarch64_msvc-0.39.0/.cargo-checksum.json 2023-07-30 22:31:07.786828400 +0000
@@ -1 +1 @@
-{"files":{"Cargo.toml":"1fad49ab8d38ae3707d6f4a14e33b71fb445c04cae4de9336086474a19db3e8c","build.rs":"cb87ced2a369513d4593ceec97e176dd38335501ada9f960cb72c454979335a2","lib/windows.lib":"fcc8e2fdb18c00e439d7778176f6aaf38923cef42a4e955945c1e50d8891efab","src/lib.rs":"bdf6c7cf1fc01f69cc1d4e52948d1f246fdd310e6323d5dd1efd23f1daf382ef"},"package":"ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"1fad49ab8d38ae3707d6f4a14e33b71fb445c04cae4de9336086474a19db3e8c","build.rs":"2925d8912d173bb2b1b0cd4db45cea60c6ec7e895dc9138303d806ba549a12a1","lib/windows.lib":"fcc8e2fdb18c00e439d7778176f6aaf38923cef42a4e955945c1e50d8891efab","src/lib.rs":"bdf6c7cf1fc01f69cc1d4e52948d1f246fdd310e6323d5dd1efd23f1daf382ef"},"package":"ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"}
\ No newline at end of file