Repository navigation
Conversation
* contrib/Dockerfile.win32.static: Append to LDFLAGS instead of replacing it, so configure finds libiconv in $INSTALLDIR/lib. * .gitlab-ci.yml (MinGW64-static): Likewise. Part of #388 (case 2) Copyright-paperwork-exempt: Yes Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018Q2J3trRVSmFTMeMeCmd64
Contributor
Author
|
I've now run the full Docker build,
On the page from #388 (
The other two files on that page come out the same way. |
Owner
|
Thank you for your contribution. Fixed by 5d9644d (different hash because cherry-picked your commit to test in CI on gitlab.com). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of #388 (case 2). Companion to #399.
The release
wget2.exeis built-iconv, so a non-ASCII file name taken from a UTF-8 page is written as raw UTF-8 and shows up as mojibake on Windows:8.½.(1963).DSP.V1.zipinstead of8.½.(1963).DSP.V1.zip.The image builds a static libiconv into
$INSTALLDIRand setsLDFLAGS="-L$INSTALLDIR/lib", but the wget2 step sets its ownLDFLAGS, which replaces it, so configure can't link its iconv test. This appends instead, in the Dockerfile and in the MinGW64-static CI job.Checked with an llvm-mingw cross-build against a static libiconv 1.18, using the same
CPPFLAGSandLDFLAGSas the image (I didn't run the full Docker build):LDFLAGSreplaced, as now:checking for iconv... no, consider installing GNU libiconv, so-iconv.LDFLAGSappended:checking for iconv... yesandchecking how to link with libiconv... $INSTALLDIR/lib/libiconv.a, so+iconv.On Windows 11, the
+iconvbuild saves8.½.(1963).DSP.V1.zipfrom a UTF-8 page with--restrict-file-names=nocontrol, and withwindows,nocontrolonce #399 is in.One side effect: with iconv, the default
windowsmode escapes the name in the local code page, so it becomes8.%BD.(1963).DSP.V1.zipinstead of8.%C2%BD.(1963).DSP.V1.zip. That's the spelling wget 1.x used, so--no-clobbermirrors made with wget 1.x match again, but mirrors made with the current 2.x release will see those names change once.I couldn't check whether the CI image sets
LDFLAGSthe same way. If it doesn't, the CI change is a no-op.