{"thread":{"id":"54759","subject":"[PATCH] ci(vs-build): stop passing the iconv library location explicitly","startedAt":"2020-12-04T14:24:38Z","lastAt":"2020-12-04T22:15:04Z","messageCount":3,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"411326","messageId":"pull.805.git.1607091741254.gitgitgadget@gmail.com","threadId":"54759","inReplyTo":null,"subject":"[PATCH] ci(vs-build): stop passing the iconv library location explicitly","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-12-04T14:22:20Z","receivedAt":"2020-12-04T14:24:38Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Dennis Ameling \n\nSomething changed in `vcpkg` (which we use in our Visual C++ build to\nprovide the dependencies such as libcurl) and our `vs-build` job started\nfailing in CI. The reason is that we had a work-around in place to help\nCMake find iconv, and this work-around is neither needed nor does it\nwork anymore.\n\nFor the full discussion with the vcpkg project, see this comment:\nhttps://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280\n\nSigned-off-by: Dennis Ameling \nSigned-off-by: Johannes Schindelin \n---\n ci: fix the vs-build job so that CI builds pass again\n \n This was noticed first in a Git for Windows PR.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-805%2Fdscho%2Fvs-build-and-libiconv-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-805/dscho/vs-build-and-libiconv-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/805\n\n .github/workflows/main.yml | 1 -\n compat/vcbuild/scripts/clink.pl | 2 +-\n contrib/buildsystems/engine.pl | 2 +-\n 3 files changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/.github/workflows/main.yml b/.github/workflows/main.yml\nindex a940997f1b..f1f0d1fe35 100644\n--- a/.github/workflows/main.yml\n+++ b/.github/workflows/main.yml\n@@ -201,7 +201,6 @@ jobs:\n shell: bash\n run: |\n cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \\\n- -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \\\n -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON\n - name: MSBuild\n run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142\ndiff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl\nindex df167d1e1a..3bd824154b 100755\n--- a/compat/vcbuild/scripts/clink.pl\n+++ b/compat/vcbuild/scripts/clink.pl\n@@ -45,7 +45,7 @@\n \t\tpush(@args, \"zlib.lib\");\n \t }\n \t} elsif (\"$arg\" eq \"-liconv\") {\n-\t\tpush(@args, \"libiconv.lib\");\n+\t\tpush(@args, \"iconv.lib\");\n \t} elsif (\"$arg\" eq \"-lcrypto\") {\n \t\tpush(@args, \"libcrypto.lib\");\n \t} elsif (\"$arg\" eq \"-lssl\") {\ndiff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl\nindex 2ff9620459..ed6c45988a 100755\n--- a/contrib/buildsystems/engine.pl\n+++ b/contrib/buildsystems/engine.pl\n@@ -351,7 +351,7 @@ sub handleLinkLine\n } elsif (\"$part\" eq \"-lexpat\") {\n push(@libs, \"libexpat.lib\");\n } elsif (\"$part\" eq \"-liconv\") {\n- push(@libs, \"libiconv.lib\");\n+ push(@libs, \"iconv.lib\");\n } elsif ($part =~ /^[-\\/]/) {\n push(@lflags, $part);\n } elsif ($part =~ /\\.(a|lib)$/) {\n\nbase-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6\n-- \ngitgitgadget\n"},{"id":"411367","messageId":"xmqqv9dhe3wi.fsf@gitster.c.googlers.com","threadId":"54759","inReplyTo":"pull.805.git.1607091741254.gitgitgadget@gmail.com","subject":"Re: [PATCH] ci(vs-build): stop passing the iconv library location explicitly","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-12-04T20:02:05Z","receivedAt":"2020-12-04T20:03:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" \nwrites:\n\n> From: Dennis Ameling \n>\n> Something changed in `vcpkg` (which we use in our Visual C++ build to\n> provide the dependencies such as libcurl) and our `vs-build` job started\n> failing in CI. The reason is that we had a work-around in place to help\n> CMake find iconv, and this work-around is neither needed nor does it\n> work anymore.\n>\n> For the full discussion with the vcpkg project, see this comment:\n> https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280\n>\n> Signed-off-by: Dennis Ameling \n> Signed-off-by: Johannes Schindelin \n> ---\n> ci: fix the vs-build job so that CI builds pass again\n> \n> This was noticed first in a Git for Windows PR.\n\nThis is probably the same breakage I've been seeing, e.g.\nhttps://github.com/git/git/runs/1494253517\n\nThanks for taking care of it.\n\nI guess we should just apply directly to 'master' (or 'maint' and\nmerge up), but I can queue it just like all other topics and have it\ntraverse through 'seen'->'next'->'master'.\n\n"},{"id":"411409","messageId":"nycvar.QRO.7.76.6.2012041612300.25979@tvgsbejvaqbjf.bet","threadId":"54759","inReplyTo":"xmqqv9dhe3wi.fsf@gitster.c.googlers.com","subject":"Re: [PATCH] ci(vs-build): stop passing the iconv library location explicitly","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-12-04T22:12:57Z","receivedAt":"2020-12-04T22:15:04Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 4 Dec 2020, Junio C Hamano wrote:\n\n> \"Johannes Schindelin via GitGitGadget\" \n> writes:\n>\n> > From: Dennis Ameling \n> >\n> > Something changed in `vcpkg` (which we use in our Visual C++ build to\n> > provide the dependencies such as libcurl) and our `vs-build` job started\n> > failing in CI. The reason is that we had a work-around in place to help\n> > CMake find iconv, and this work-around is neither needed nor does it\n> > work anymore.\n> >\n> > For the full discussion with the vcpkg project, see this comment:\n> > https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280\n> >\n> > Signed-off-by: Dennis Ameling \n> > Signed-off-by: Johannes Schindelin \n> > ---\n> > ci: fix the vs-build job so that CI builds pass again\n> >\n> > This was noticed first in a Git for Windows PR.\n>\n> This is probably the same breakage I've been seeing, e.g.\n> https://github.com/git/git/runs/1494253517\n\nYes.\n\n> I guess we should just apply directly to 'master' (or 'maint' and\n> merge up), but I can queue it just like all other topics and have it\n> traverse through 'seen'->'next'->'master'.\n\nWhatever is easier for you.\n\nThanks,\nDscho\n"}]}