StrawberryPerl / build-extlibs

16 stars 11 forks source link

libiconv: update patches for 1.17 #44

Open shawnlaffan opened 1 year ago

shawnlaffan commented 1 year ago

MSYS2 is at this version and has patches that apply cleanly and get it to build.

This is largely as a reminder for me to submit a PR.

shawnlaffan commented 1 year ago

Although there are test failures with gcc-12.2 and gcc-13.1

These might just be line ending differences, but maybe not. Files contents are below the error message.

make check-extra
make[2]: Entering directory '/z/extlib/_bprogressive__.src/libiconv-1.17/tests'
make[2]: Nothing to be done for 'check-extra'.
make[2]: Leaving directory '/z/extlib/_bprogressive__.src/libiconv-1.17/tests'
/bin/sh ./check-translit . Quotes UTF-8 ISO-8859-1
/bin/sh ./check-translit . Quotes UTF-8 ASCII
/bin/sh ./check-translit . Translit1 ISO-8859-1 ASCII
/bin/sh ./check-translitfailure . TranslitFail1 ISO-8859-1 ASCII
/bin/sh ./check-subst
tmp-out tmp-ok differ: byte 2, line 1
make[1]: *** [Makefile:143: check] Error 1
make[1]: Leaving directory '/z/extlib/_bprogressive__.src/libiconv-1.17/tests'
make: *** [Makefile:95: check] Error 2
# cat -v tmp-out
BM-CM-^BM-BM-+0xc3M-CM-^BM-BM-;M-CM-^BM-BM-+0xb6M-CM-^BM-BM-;se BM-CM-^BM-BM-+0xc3M-CM-^BM-BM-;M-CM-^BM-BM-+0xbcM-CM-^BM
-BM-;bchen
cat -v tmp-ok 
BM-BM-+0xc3M-BM-;M-BM-+0xb6M-BM-;se BM-BM-+0xc3M-BM-;M-BM-+0xbcM-BM-;bchen
shawnlaffan commented 1 year ago

The test failure might not be an issue. It might also be fixed with a variant of the patch at https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libiconv/0003-add-cp65001-as-utf8-alias.patch

Need to check the code page used in the containers.

shawnlaffan commented 1 year ago

And we are already at 1.17 so this is about patching for gcc-12 and 13.