Skip to content

makepkg-git-i686: ensure that MINGW_ARCH=mingw32 works#99

Merged
dscho merged 1 commit into
git-for-windows:mainfrom
dscho:fix-makepkg-git-i686
May 27, 2025
Merged

makepkg-git-i686: ensure that MINGW_ARCH=mingw32 works#99
dscho merged 1 commit into
git-for-windows:mainfrom
dscho:fix-makepkg-git-i686

Conversation

@dscho
Copy link
Copy Markdown
Member

@dscho dscho commented May 27, 2025

It needs the /etc/msystem.d/ files... This is the reason why the recent git-artifacts runs in git-sdk-64 failed.

The underlying root cause is most likely the "filesystem (2025.02.23-1 -> 2025.05.08-1)" upgrade in 43e407b.

I verified in my fork that this commit fixes the issue.

@dscho
makepkg-git-i686: ensure that MINGW_ARCH=mingw32 works
c3dc3a1 
This needs the `/etc/msystem.d/` files...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho requested a review from mjcheetham May 27, 2025 13:37
@dscho dscho self-assigned this May 27, 2025
@dscho dscho merged commit b753da3 into git-for-windows:main May 27, 2025
21 checks passed
@dscho dscho deleted the fix-makepkg-git-i686 branch May 27, 2025 14:21
@jeremyd2019
Copy link
Copy Markdown
Contributor

jeremyd2019 commented May 27, 2025

with the new pacman & makepkg_mingw.conf, you'd also need /etc/makepkg_mingw.d

@dscho
Copy link
Copy Markdown
Member Author

dscho commented May 27, 2025

with the new pacman & makepkg_mingw.conf, you'd also need /etc/makepkg_mingw.d

Well, my plan is to stop building mingw-w64-i686-git in git-sdk-64 (there is not actually any workflow left that does that and that I use).

So maybe this can wait a little (the problems arose only because the i686 edit-git-bash.exe was being built using the x86_64 gcc).

@dscho dscho mentioned this pull request Jun 3, 2025
Merged
dscho added a commit to git-for-windows/build-extra that referenced this pull request Jun 3, 2025
@dscho
make-file-list: include the new /etc/msystem.d/ folder
dca9bae 
As of filesystem-2025.05.08-1, the various definitions depending on the
environment variable `MSYSTEM` are no longer in a single `/etc/msystem`
file, but rather in files in the new `/etc/msystem.d/` directory whose
filenames reflect the value of said environment variable.

As per the suggestion in
git-for-windows/git-sdk-64#99 (comment),
let's include this directory in the payload of Git for Windows'
installer so that users are not greeted with the message:

	bash: /etc/msystem.d/MSYS: No such file or directory

Suggested-by: Jeremy Drake <github@jdrake.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho mentioned this pull request Jun 3, 2025
Merged
@dscho
Copy link
Copy Markdown
Member Author

dscho commented Jun 3, 2025

with the new pacman & makepkg_mingw.conf, you'd also need /etc/makepkg_mingw.d

Luckily, we already have that implicitly defined:

git-sdk-64/.sparse/makepkg-git

Line 51 in 5ad79d0

/etc/makepkg*

As to having the /etc/msystem.d/ directory not only available for the builds, but also in the end users' installations, I opened git-for-windows/build-extra#621, which will need to be merged quickly because -rc1 is scheduled for today and I haven't managed to get -rc0 out yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mjcheetham mjcheetham mjcheetham 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.

3 participants

@dscho @jeremyd2019 @mjcheetham