From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Dennis Ameling <dennis@dennisameling.com>
Subject: [PATCH] ci(vs-build): stop passing the iconv library location explicitly
Date: Fri, 04 Dec 2020 14:22:20 +0000 [thread overview]
Message-ID: <pull.805.git.1607091741254.gitgitgadget@gmail.com> (raw)
From: Dennis Ameling <dennis@dennisameling.com>
Something changed in `vcpkg` (which we use in our Visual C++ build to
provide the dependencies such as libcurl) and our `vs-build` job started
failing in CI. The reason is that we had a work-around in place to help
CMake find iconv, and this work-around is neither needed nor does it
work anymore.
For the full discussion with the vcpkg project, see this comment:
https://github.com/microsoft/vcpkg/issues/14780#issuecomment-735368280
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
ci: fix the vs-build job so that CI builds pass again
This was noticed first in a Git for Windows PR.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-805%2Fdscho%2Fvs-build-and-libiconv-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-805/dscho/vs-build-and-libiconv-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/805
.github/workflows/main.yml | 1 -
compat/vcbuild/scripts/clink.pl | 2 +-
contrib/buildsystems/engine.pl | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a940997f1b..f1f0d1fe35 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -201,7 +201,6 @@ jobs:
shell: bash
run: |
cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
- -DIconv_LIBRARY=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/lib/libiconv.lib -DIconv_INCLUDE_DIR=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows/include \
-DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
- name: MSBuild
run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index df167d1e1a..3bd824154b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -45,7 +45,7 @@
push(@args, "zlib.lib");
}
} elsif ("$arg" eq "-liconv") {
- push(@args, "libiconv.lib");
+ push(@args, "iconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") {
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 2ff9620459..ed6c45988a 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -351,7 +351,7 @@ sub handleLinkLine
} elsif ("$part" eq "-lexpat") {
push(@libs, "libexpat.lib");
} elsif ("$part" eq "-liconv") {
- push(@libs, "libiconv.lib");
+ push(@libs, "iconv.lib");
} elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
base-commit: 898f80736c75878acc02dc55672317fcc0e0a5a6
--
gitgitgadget
next reply other threads:[~2020-12-04 14:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 14:22 Johannes Schindelin via GitGitGadget [this message]
2020-12-04 20:02 ` [PATCH] ci(vs-build): stop passing the iconv library location explicitly Junio C Hamano
2020-12-04 22:12 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.805.git.1607091741254.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=dennis@dennisameling.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).