Skip to content

Improve ARM64 support of the sdk function #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 20, 2023
Merged

Improve ARM64 support of the sdk function #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
047b378
sdk: learn about MSYSTEM=CLANGARM64
dscho Dec 22, 2022
75a09f6
sdk build: allow building ARM64 flavors of MINGW packages
dscho Dec 22, 2022
3c8aba0
sdk create-shortcut: accommodate for `git-sdk-arm64`
dscho Dec 22, 2022
621f5f6
git-extra: bump version
dscho Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions git-extra/PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}"
pkgname=($_realname
"${MINGW_PACKAGE_PREFIX}-${_realname}")
_ver_base=1.1
pkgver=1.1.616.3f26b1b0c
pkgver=1.1.620.3c8aba0b6
pkgrel=1
pkgdesc="Git for Windows extra files"
arch=('any')
Expand Down Expand Up @@ -79,7 +79,7 @@ sha256sums=('8ed76d1cb069ac8568f21c431f5e23caebea502d932ab4cdff71396f4f0d5b72'
'683ab066be19cb4defec470ebd53f165ca5dbf761fd40c13aee8abe31ba42803'
'1cf2c13fb97c51375a76ed479362c3cbcdb51ab4d3a745e8d2c3a780badd8d46'
'201fc40c1aadadceccc617511a4add05536b3638bff34456cc334e3b21c130e7'
'7db260f31f9d31cfb7bcc76f379272e4e4b9fc0890e62adef8bf2cb624f6e296'
'180e05c1b8afa34d59cb2f6635bc75fece10474f37e164ea5916a6b3b56e20dd'
'22f41610dea842890955032af30efdb60e80f310e95a04e57ab36b10e0376923'
'5fe1fdce2f3c4b8dc2d026f3b8f000925c82e39655aea4e37d543862269d0732'
'15b40ab72dea884f659cfbe441e9a40b2d8d63e490a3c14824a55607368e476d'
Expand Down
39 changes: 30 additions & 9 deletions git-extra/git-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,27 @@ sdk () {
'') break;;
-*) sdk die "Unknown option: %s\n" "$1"; return 1;;
esac; do shift; done &&
case "$(uname -m)" in
i686) bitness=" 32-bit";;
x86_64) bitness=" 64-bit";;
*) bitness=;;
case "$MSYSTEM" in
MINGW32) shortcut_suffix=" 32-bit";;
MINGW64) shortcut_suffix=" 64-bit";;
CLANGARM64) shortcut_suffix=" arm64";;
MSYS)
case "$(uname -m)" in
i686) shortcut_suffix=" 32-bit";;
x86_64)
if test -d /clangarm64
then
shortcut_suffix=" arm64"
else
shortcut_suffix=" 64-bit"
fi
;;
*) shortcut_suffix=;;
esac
;;
*) shortcut_suffix=;;
esac &&
desktop_icon_path="Git SDK$bitness.lnk" &&
desktop_icon_path="Git SDK$shortcut_suffix.lnk" &&
desktop_icon_path="$(create-shortcut.exe -n --desktop-shortcut /git-bash.exe "$desktop_icon_path" |
sed -n 's/^destination: //p')" &&
if test -n "$force" || test ! -f "$desktop_icon_path"
Expand Down Expand Up @@ -206,11 +221,17 @@ sdk () {
MINGW_MOUNT_POINT=/mingw32
;;
x86_64)
MSYSTEM=MINGW64
MINGW_MOUNT_POINT=/mingw64
if test -d /clangarm64
then
MSYSTEM=CLANGARM64
MINGW_MOUNT_POINT=/clangarm64
else
MSYSTEM=MINGW64
MINGW_MOUNT_POINT=/mingw64
fi
;;
*)
sdk die "Could not determine bitness"
sdk die "Could not determine CPU architecture"
return 1
;;
esac
Expand Down Expand Up @@ -360,7 +381,7 @@ sdk () {
then
case "$MSYSTEM" in
MSYS) sdk makepkg -f;;
MINGW*) MINGW_ARCH=${MSYSTEM,,} sdk makepkg-mingw -f;;
CLANGARM*|MINGW*) MINGW_ARCH=${MSYSTEM,,} sdk makepkg-mingw -f;;
esac
return $?
fi
Expand Down