* [PATCH] Makefile: POSIX windres
@ 2017-01-07 21:41 Steven Penny
2017-01-09 3:10 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Steven Penny @ 2017-01-07 21:41 UTC (permalink / raw)
To: git; +Cc: Steven Penny
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(-)
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: POSIX windres
2017-01-07 21:41 [PATCH] Makefile: POSIX windres Steven Penny
@ 2017-01-09 3:10 ` Junio C Hamano
2017-01-09 8:09 ` Johannes Schindelin
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2017-01-09 3:10 UTC (permalink / raw)
To: Steven Penny, Johannes Schindelin, Johannes Sixt; +Cc: git
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?
Hannes, Dscho, is this change OK with you guys?
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: POSIX windres
2017-01-09 3:10 ` Junio C Hamano
@ 2017-01-09 8:09 ` Johannes Schindelin
2017-01-09 9:47 ` Junio C Hamano
2017-01-09 19:54 ` Johannes Sixt
0 siblings, 2 replies; 5+ messages in thread
From: Johannes Schindelin @ 2017-01-09 8:09 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Steven Penny, Johannes Sixt, git
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 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: POSIX windres
2017-01-09 8:09 ` Johannes Schindelin
@ 2017-01-09 9:47 ` Junio C Hamano
2017-01-09 19:54 ` Johannes Sixt
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-01-09 9:47 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Steven Penny, Johannes Sixt, git
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: POSIX windres
2017-01-09 8:09 ` Johannes Schindelin
2017-01-09 9:47 ` Junio C Hamano
@ 2017-01-09 19:54 ` Johannes Sixt
1 sibling, 0 replies; 5+ messages in thread
From: Johannes Sixt @ 2017-01-09 19:54 UTC (permalink / raw)
To: Johannes Schindelin, Junio C Hamano; +Cc: Steven Penny, git
Am 09.01.2017 um 09:09 schrieb Johannes Schindelin:
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-09 19:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-07 21:41 [PATCH] Makefile: POSIX windres Steven Penny
2017-01-09 3:10 ` Junio C Hamano
2017-01-09 8:09 ` Johannes Schindelin
2017-01-09 9:47 ` Junio C Hamano
2017-01-09 19:54 ` Johannes Sixt
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).