Skip to contentSkip to conversation

Makefile: POSIX windres

PATCH In review Steven Penny 4 participants 5 messages Jan 7, 2017 – Jan 9, 2017 Kbuild

lore
Share & tools
lore

Steven Penny

author
#0 lore raw

PATCH 1/1 Makefile: POSIX windres

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 <[email protected]>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index d861bd9..a2a1212 100644
@@ -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
Signature · 1 line
2.8.3
#1 lore raw
Quoted 7 lines · 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 <[email protected]>

---

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

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

Quoted 16 lines
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index d861bd9..a2a1212 100644
@@ -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 lore raw

Hi Junio,

Quoted 11 lines · Junio C Hamano
Quoted 7 lines · 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 <[email protected]>

---

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

#3 lore raw
Quoted 6 lines · Johannes Schindelin
Quoted 1 line

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.

#4 lore raw
In reply to Johannes Schindelin

Am 09.01.2017 um 09:09 schrieb Johannes Schindelin:

Quoted 11 lines

Hi Junio,

Quoted 7 lines · Junio C Hamano
Quoted 5 lines · 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

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Steven Penny <[email protected]>

---

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