Re: [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 7, 2020, 20:09 UTC
Message-ID: <nycvar.QRO.7.76.6.2009072208430.56@tvgsbejvaqbjf.bet>
In-Reply-To: <pull.728.git.1599458405948.gitgitgadget@gmail.com>

Hi Orgad,

On Mon, 7 Sep 2020, Orgad Shaneh via GitGitGadget wrote:

> From: Orgad Shaneh <orgads@gmail.com>
>
> expat.lib -> libexpat.lib (libexpatd.lib for debug build).

Good point, I forgot to verify that this is also needed for `vcxproj`, not only for `MSVC=1`...

Thanks, Dscho

Show 47 quoted lines

>
> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
>     contrib/buildsystems: fix expat library name for generated vcxproj
>
>     expat.lib -> libexpat.lib (libexpatd.lib for debug build).
>
>     Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-728%2Forgads%2Fvcxproj-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-728/orgads/vcxproj-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/728
>
>  contrib/buildsystems/Generators/Vcxproj.pm | 1 +
>  contrib/buildsystems/engine.pl             | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
> index 5c666f9ac0..d2584450ba 100644
> --- a/contrib/buildsystems/Generators/Vcxproj.pm
> +++ b/contrib/buildsystems/Generators/Vcxproj.pm
> @@ -80,6 +80,7 @@ sub createProject {
>        $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
>        $libs_debug = $libs_release;
>        $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
> +      $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
>        $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
>      }
>
> diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
> index 070978506a..2ff9620459 100755
> --- a/contrib/buildsystems/engine.pl
> +++ b/contrib/buildsystems/engine.pl
> @@ -349,7 +349,7 @@ sub handleLinkLine
>          } elsif ("$part" eq "-lcurl") {
>              push(@libs, "libcurl.lib");
>          } elsif ("$part" eq "-lexpat") {
> -            push(@libs, "expat.lib");
> +            push(@libs, "libexpat.lib");
>          } elsif ("$part" eq "-liconv") {
>              push(@libs, "libiconv.lib");
>          } elsif ($part =~ /^[-\/]/) {
>
> base-commit: e19713638985533ce461db072b49112da5bd2042
> --
> gitgitgadget
>