Skip to content

git-extra: add the aarch64 Pacman repository when appropriate #467

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

Jump to bottom
Merged
merged 6 commits into from
Jan 20, 2023
Merged

git-extra: add the aarch64 Pacman repository when appropriate #467

merged 6 commits into from
Jan 20, 2023

Conversation

@dscho
Copy link
Member

@dscho dscho commented Jan 19, 2023

Once deployed, this will let git-sdk-arm64 update from Git for Windows' aarch64 Pacman repository.

dscho added 6 commits January 19, 2023 10:28
@dscho
sdk: learn about MSYSTEM=CLANGARM64
047b378 
This is needed so that e.g. `sdk cd <package>` won't mistake
`git-sdk-arm64` for `git-sdk-64`.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
sdk build: allow building ARM64 flavors of MINGW packages
75a09f6 
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
sdk create-shortcut: accommodate for git-sdk-arm64
3c8aba0 
We cannot trust `uname -m` too much when building on ARM64, as there is
no Windows/ARM64 version of the MSYS2 runtime (due to lack of Cygwin
support for that platform).

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
git-extra: bump version
621f5f6 
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
git-extra: add aarch64 Pacman repository in git-sdk-arm64
c80936e 
This follows the same principle as adding the `mingw32` repository in
git-sdk-64 and the `minw64` repository in git-sdk-32.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho
git-extra: bump version
f476f41 
Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho requested a review from dennisameling January 19, 2023 11:32
@dscho dscho self-assigned this Jan 19, 2023
@dscho
Copy link
Member Author

dscho commented Jan 19, 2023

To avoid version clashes, this is based on #456 (and can only be merged after that).

Note: I just realized that we have a problem in our mingw-w64-clang-aarch64 packages: I had assumed that the Pacman repository was already active, but it wasn't. For that reason, mingw-w64-curl was linked against MSYS2's version of mingw-w64-openssl (which is already on version v3.x), not against Git for Windows' version (which remains with v1.1.x until support for that version runs out).

Therefore, we will have some manual updating to do.

@dscho dscho mentioned this pull request Jan 19, 2023
Merged
@dscho
Copy link
Member Author

dscho commented Jan 20, 2023

mingw-w64-curl was linked against MSYS2's version of mingw-w64-openssl (which is already on version v3.x), not against Git for Windows' version (which remains with v1.1.x until support for that version runs out).

Therefore, we will have some manual updating to do.

@dennisameling I guess the safest way would be to use downgrade-pacman-package.sh to pin mingw-w64-openssl and mingw-w64-curl to the versions you committed initially, then rebuild the current mingw-w64-curl, and then unpin the packages. What do you think?

@dennisameling
Copy link
Contributor

dennisameling commented Jan 20, 2023

@dennisameling I guess the safest way would be to use downgrade-pacman-package.sh to pin mingw-w64-openssl and mingw-w64-curl to the versions you committed initially, then rebuild the current mingw-w64-curl, and then unpin the packages. What do you think?

That should work indeed! Another option would be to merge this PR and have me install GfW's openssl version locally, then commit that to git-sdk-arm64. Future updates will then automatically use GfW's flavor. WDYT?

@dscho
Copy link
Member Author

dscho commented Jan 20, 2023

install GfW's openssl version locally, then commit that to git-sdk-arm64. Future updates will then automatically use GfW's flavor.

That won't work because git push will fail due to the missing OpenSSL v3.x DLL that cURL depends on... 😁

@dscho
Copy link
Member Author

dscho commented Jan 20, 2023 •
edited by gitforwindowshelper bot
Loading

/deploy git-extra

The i686/x86_64 and the arm64 workflow runs were started.

@dscho dscho merged commit e6957c2 into git-for-windows:main Jan 20, 2023
@dscho dscho deleted the add-aarch64-pacman-repository branch January 20, 2023 12:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dennisameling dennisameling dennisameling approved these changes

Assignees

@dscho dscho

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dscho @dennisameling