threads / patch / 44834

patchMakefile: POSIX windres

Subject: [PATCH] Makefile: POSIX windres

## tl;dr

5 messages between Jan 7, 2017 and Jan 9, 2017. Diffs are folded; open one to read it.

replies: 4people: 4as markdown or json

Steven Penny· Jan 7, 2017, 21:41 UTC · lore

When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax is not supported.

http://cygwin.com/ml/cygwin/2017-01/msg00036.html

Signed-off-by: Steven Penny <svnpenn@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Makefile +1 −1

diff --git a/Makefile b/Makefile
index d861bd9..a2a1212 100644
--- a/Makefile
+++ b/Makefile
@@ -1816,7 +1816,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
 git.res: git.rc GIT-VERSION-FILE
 	$(QUIET_RC)$(RC) \
 	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
-	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
+	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
 
 # This makes sure we depend on the NO_PERL setting itself.
 $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS

-- 
2.8.3

Junio C Hamano· Jan 9, 2017, 03:10 UTC · re: Steven Penny · lore

Re: [PATCH] Makefile: POSIX windres

Steven Penny <svnpenn@gmail.com> writes:

Show 7 quoted lines

> When environment variable POSIXLY_CORRECT is set, the "input -o output" syntax
> is not supported.
>
> http://cygwin.com/ml/cygwin/2017-01/msg00036.html
>
> Signed-off-by: Steven Penny <svnpenn@gmail.com>
> ---

Who other than cygwin build uses this target?  Git for Windows?

Hannes, Dscho, is this change OK with you guys?

Show 16 quoted lines

>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index d861bd9..a2a1212 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1816,7 +1816,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
>  git.res: git.rc GIT-VERSION-FILE
>  	$(QUIET_RC)$(RC) \
>  	  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
> -	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
> +	  -DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
>  
>  # This makes sure we depend on the NO_PERL setting itself.
>  $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS

Johannes Schindelin· Jan 9, 2017, 08:09 UTC · re: Junio C Hamano · lore

Re: [PATCH] Makefile: POSIX windres

Hi Junio,

On Sun, 8 Jan 2017, Junio C Hamano wrote:

Show 11 quoted lines

> Steven Penny <svnpenn@gmail.com> writes:
> 
> > When environment variable POSIXLY_CORRECT is set, the "input -o
> > output" syntax is not supported.
> >
> > http://cygwin.com/ml/cygwin/2017-01/msg00036.html
> >
> > Signed-off-by: Steven Penny <svnpenn@gmail.com>
> > ---
> 
> Who other than cygwin build uses this target?  Git for Windows?

Yes, Git for Windows uses this target, as did msysGit (and I suspect Hannes' setup).

The resources are built correctly in Git for Windows SDK with this patch, and I just verified that the windres shipped with the last msysGit (AKA Git for Windows 1.x' SDK) handles the -i flag correctly, too. That is, at least windres.exe included in binutils-2.19.1-mingw32-bin.tar.gz (which was current at the time I updated msysGit on Feb 19 2009) can handle it.

So: ACK

Ciao, Dscho

P.S.: I applied this patch to Git for Windows' `master`: https://github.com/git-for-windows/git/commit/744120c602

Junio C Hamano· Jan 9, 2017, 09:47 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Makefile: POSIX windres

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 6 quoted lines

>> Who other than cygwin build uses this target?  Git for Windows?
>
> Yes, Git for Windows uses this target, as did msysGit (and I suspect
> Hannes' setup).
> ...
> So: ACK

Thanks.

Johannes Sixt· Jan 9, 2017, 19:54 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Makefile: POSIX windres

Am 09.01.2017 um 09:09 schrieb Johannes Schindelin:

Show 18 quoted lines

> Hi Junio,
>
> On Sun, 8 Jan 2017, Junio C Hamano wrote:
>
>> Steven Penny <svnpenn@gmail.com> writes:
>>
>>> When environment variable POSIXLY_CORRECT is set, the "input -o
>>> output" syntax is not supported.
>>>
>>> http://cygwin.com/ml/cygwin/2017-01/msg00036.html
>>>
>>> Signed-off-by: Steven Penny <svnpenn@gmail.com>
>>> ---
>>
>> Who other than cygwin build uses this target?  Git for Windows?
>
> Yes, Git for Windows uses this target, as did msysGit (and I suspect
> Hannes' setup).

The patch works for me, too.

-- Hannes