Skip to content
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.

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

starship: update to 1.17.1 #19687

Merged
merged 3 commits into from
Jan 8, 2024
Merged

starship: update to 1.17.1 #19687

merged 3 commits into from
Jan 8, 2024

Conversation

ognevny
Copy link
Collaborator

@ognevny ognevny commented Jan 8, 2024

see starship/starship#5690 for PR details

@ognevny ognevny changed the title Update starship starship: update to 1.17.1 Jan 8, 2024
@Biswa96
Copy link
Member

Biswa96 commented Jan 8, 2024

Should we wait for that upstream merge request?

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 8, 2024

Should we wait for that upstream merge request?

maybe, but I don't know their dependency policy

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 8, 2024

maybe, but I don't know their dependency policy

merged! we can leave this applied, this should be in a new release soon

@Biswa96 Biswa96 merged commit 26e85ad into msys2:master Jan 8, 2024
8 checks passed
@ognevny ognevny deleted the update-starship branch January 8, 2024 17:40
@Biswa96
Copy link
Member

Biswa96 commented Jan 8, 2024

The clangarm64 build failed again. @jeremyd2019 Would you like to look into the build issue? Or should we revert the update again?

@jeremyd2019
Copy link
Member

The neon_intrins.h in C:/Users/Administrator/.cargo/registry/src/index.crates.io-6f17d22bba15001f/libz-ng-sys-1.1.13/src/zlib-ng/arch/arm/neon_intrins.h does not contain the fix from
zlib-ng/zlib-ng@f9228d8. I don't know why that would be, it appears the git submodule reference was updated for that release of the crate. Maybe a mistake was made when making the release (ie, forgetting to git submodule update?).

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 9, 2024

The neon_intrins.h in C:/Users/Administrator/.cargo/registry/src/index.crates.io-6f17d22bba15001f/libz-ng-sys-1.1.13/src/zlib-ng/arch/arm/neon_intrins.h does not contain the fix from
zlib-ng/zlib-ng@f9228d8. I don't know why that would be, it appears the git submodule reference was updated for that release of the crate. Maybe a mistake was made when making the release (ie, forgetting to git submodule update?).

the submodule was updated at rust-lang/libz-sys#162

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 9, 2024

The neon_intrins.h in C:/Users/Administrator/.cargo/registry/src/index.crates.io-6f17d22bba15001f/libz-ng-sys-1.1.13/src/zlib-ng/arch/arm/neon_intrins.h does not contain the fix from
zlib-ng/zlib-ng@f9228d8. I don't know why that would be, it appears the git submodule reference was updated for that release of the crate. Maybe a mistake was made when making the release (ie, forgetting to git submodule update?).

the submodule was updated at rust-lang/libz-sys#162

maybe patch wasn't applied correctly... I don't know. let's wait until 1.17.2 release
edit: no, this crate has correct version

@ognevny
Copy link
Collaborator Author

ognevny commented Jan 9, 2024

the code there

#if defined(_MSC_VER) && (defined(_M_ARM64) || defined(_M_ARM64EC))
/* arm64_neon.h is MSVC specific */
#  include <arm64_neon.h>
#else
#  include <arm_neon.h>
#endif

@jeremyd2019
Copy link
Member

Yes, but the code actually downloaded:

# head /c/Users/Administrator/.cargo/registry/src/index.crates.io-6f17d22bba15001f/libz-sys-1.1.13/src/zlib-ng/arch/arm/neon_intrins.h
#ifndef ARM_NEON_INTRINS_H
#define ARM_NEON_INTRINS_H

#ifdef _M_ARM64
#  include <arm64_neon.h>
#else
#  include <arm_neon.h>
#endif

#if defined(ARM_NEON) && !defined(__aarch64__) && !defined(_M_ARM64)

I think this is some sort of issue with how libz-sys 1.1.13 was released, somehow with different code than a fresh (recursive) checkout of the tag would have. @mati865 cargo is pretty much a mystery to me, is that even possible with how it works?

@jeremyd2019
Copy link
Member

jeremyd2019 commented Jan 9, 2024

Contrast with:

$ git clone -b 1.1.13 --recursive https://github.com/rust-lang/libz-sys.git 

$ head libz-sys/src/zlib-ng/arch/arm/neon_intrins.h
#ifndef ARM_NEON_INTRINS_H
#define ARM_NEON_INTRINS_H

#if defined(_MSC_VER) && (defined(_M_ARM64) || defined(_M_ARM64EC))
/* arm64_neon.h is MSVC specific */
#  include <arm64_neon.h>
#else
#  include <arm_neon.h>
#endif

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants