git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj
@ 2020-09-07  6:00 Orgad Shaneh via GitGitGadget
  2020-09-07 20:09 ` Johannes Schindelin
  0 siblings, 1 reply; 2+ messages in thread
From: Orgad Shaneh via GitGitGadget @ 2020-09-07  6:00 UTC (permalink / raw)
  To: git; +Cc: Orgad Shaneh, Orgad Shaneh

From: Orgad Shaneh <orgads@gmail.com>

expat.lib -> libexpat.lib (libexpatd.lib for debug build).

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj
  2020-09-07  6:00 [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj Orgad Shaneh via GitGitGadget
@ 2020-09-07 20:09 ` Johannes Schindelin
  0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2020-09-07 20:09 UTC (permalink / raw)
  To: Orgad Shaneh via GitGitGadget; +Cc: git, Orgad Shaneh, Orgad Shaneh

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

>
> 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
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-07 20:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-07  6:00 [PATCH] contrib/buildsystems: fix expat library name for generated vcxproj Orgad Shaneh via GitGitGadget
2020-09-07 20:09 ` Johannes Schindelin

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git