On Thu, Oct 09, 2014 at 09:22:19PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Wed, 8 Oct 2014, Marat Radchenko wrote:
>
> > +CC_MACH := $(shell sh -c '$(CC) -dumpmachine 2>/dev/null || echo not')
>
> There is a rather huge problem with that. The latest
On Thu, Oct 09, 2014 at 12:11:01PM +0200, Johannes Schindelin wrote:
> I also added one patch I find highly convenient:
>
> https://github.com/dscho/git/commit/29749c7d7b4638c63369d6cf067f5d524d0092f9
There already were two attempts to this issue:
1. http://www.spinics.net/lists/git/msg230028.h
On Thu, Oct 09, 2014 at 12:34:25AM -0700, Junio C Hamano wrote:
> No, and I do not quite see why you even need to look at -dumbmachine
> output when your goal is to make this command line
>
> >>$ make uname_O=MINGW uname_S=MINGW
>
> work sensibly. Wouldn't it be more like a series of
>
>
On Wed, Oct 08, 2014 at 01:02:10PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Marat Radchenko writes:
> >
> >> Signed-off-by: Marat Radchenko
> >> ---
> >> git-compat-util.h | 2 +-
> >> 1 file changed, 1 insertion(+), 1
On Wed, Oct 08, 2014 at 12:26:52PM -0700, Junio C Hamano wrote:
> Marat Radchenko writes:
>
> > When crosscompiling, one cannot rely on `uname` from host system.
>
> That may well be true, but is that limited to cross-compiling to
> mingw? Would it be generally true for
When crosscompiling, one cannot rely on `uname` from host system.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 5 +
1 file changed, 5 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index 9f7037e..182da50 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -14,6
Signed-off-by: Marat Radchenko
---
git-compat-util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index b338277..101c9d7 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -474,7 +474,7 @@ extern int git_munmap(void *start
intptr_t.
[1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx
Signed-off-by: Marat Radchenko
---
compat/mingw.c| 8
compat/poll/poll.c| 2 +-
compat/regex/regcomp.c| 4 ++--
compat/regex/regex_internal.h | 1 +
compat/win32/pthread.h
tic', so #undef MinGW-W64
version of FORCEINLINE.
Signed-off-by: Marat Radchenko
---
compat/nedmalloc/malloc.c.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index f216a2a..a6c8cac 100644
--- a/compat/ned
-linux-gnu-
then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.
Signed-off-by: Marat Radchenko
---
Makefile | 19 +--
config.mak.uname | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index f34a2d4..
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index a2f380f..20cbdcf 100644
--- a
Is it absolutely valid and possible to have cURL in generic
MinGW environment. Building Git without cURL is still possible
by passing NO_CURL=1
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.mak.uname b
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64).
*Compilation* tested on:
- MSVC
- msysGit environment (twice)
- Linux cross-toolchain i686-pc-mingw32
- Linux cross-toolchain i686-w64-mingw32
- Linux cross-toolchain x86_64-w64-mingw32
Also, this patchset is
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/compat/mingw.h b/comp
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 1ddd663..ba05044 100644
of stdint.h but hopefully that is not a problem.
Signed-off-by: Marat Radchenko
---
compat/mingw.h| 2 --
compat/msvc.h | 3 +++
config.mak.uname | 3 ++-
git-compat-util.h | 11 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/compat/mingw.h b/compat/ming
From: Ray Donnelly
Signed-off-by: Ray Donnelly
Signed-off-by: Marat Radchenko
---
config.mak.uname | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 324a7fc..4470a928 100644
--- a/config.mak.uname
+++ b/config.mak.uname
Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index 5e499cf..36a47cb 100644
--- a/compat/mingw.h
+++ b/compat
ss of this
commit.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index c7aaa1c..f79c0e0 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -532,11 +532,11 @@ ifneq (,
Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined
in wincon.h.
Signed-off-by: Marat Radchenko
---
compat/winansi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index efc5bb3..0ac3297 100644
--- a/compat/winansi.c
On Wed, Oct 08, 2014 at 11:40:17AM +0200, Johannes Schindelin wrote:
> To make it easier to review and substantially easier to work on this patch
> series with Git, I opened a pull request on GitHub:
>
> https://github.com/msysgit/git/pull/264
>
1. I fail to see how using a tool that doesn't
On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote:
> Hi Marat,
>
> On Wed, 8 Oct 2014, Marat Radchenko wrote:
>
> That's not what msysgit folks say (they say that msysgit is the
> development environment to build Git for Windows [*1*]).
Aaargh! msy
On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:
> Am 30.09.2014 um 09:02 schrieb Marat Radchenko:
> > This patch series fixes building on modern MinGW and MinGW-W64 (including
> > x86_64!).
> >
> > *Compilation* tested on:
> > - MSVC
> >
On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
> This patch series fixes building on modern MinGW and MinGW-W64 (including
> x86_64!).
Junio, ping?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger
/archive/2006/11/08/1035971.aspx
Signed-off-by: Marat Radchenko
---
compat/mingw.c| 8
compat/poll/poll.c| 2 +-
compat/regex/regcomp.c| 4 ++--
compat/regex/regex_internal.h | 1 +
compat/win32/pthread.h| 2 +-
compat/winansi.c | 2
Signed-off-by: Marat Radchenko
---
git-compat-util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index 9d2d5ab..5f6659c 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -474,7 +474,7 @@ extern int git_munmap(void *start
-linux-gnu-
then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.
Signed-off-by: Marat Radchenko
---
Makefile | 19 +--
config.mak.uname | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index f34a2d4..
tic', so #undef MinGW-W64
version of FORCEINLINE.
Signed-off-by: Marat Radchenko
---
compat/nedmalloc/malloc.c.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index f216a2a..a6c8cac 100644
--- a/compat/ned
When crosscompiling, one cannot rely on `uname` from host system.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 5 +
1 file changed, 5 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index 9f7037e..182da50 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -14,6
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index a2f380f..20cbdcf 100644
--- a
From: Ray Donnelly
Signed-off-by: Ray Donnelly
Signed-off-by: Marat Radchenko
---
config.mak.uname | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 324a7fc..4470a928 100644
--- a/config.mak.uname
+++ b/config.mak.uname
Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined
in wincon.h.
Signed-off-by: Marat Radchenko
---
compat/winansi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index efc5bb3..0ac3297 100644
--- a/compat/winansi.c
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/compat/mingw.h b/comp
of stdint.h but hopefully that is not a problem.
Signed-off-by: Marat Radchenko
---
compat/mingw.h| 2 --
compat/msvc.h | 3 +++
config.mak.uname | 3 ++-
git-compat-util.h | 11 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/compat/mingw.h b/compat/ming
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 948a174..d113b19 100644
Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index df0e320..ed79368 100644
--- a/compat/mingw.h
+++ b/compat
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64!).
*Compilation* tested on:
- MSVC
- msysGit environment (twice)
- Linux cross-toolchain i686-pc-mingw32
- Linux cross-toolchain i686-w64-mingw32
- Linux cross-toolchain x86_64-w64-mingw32
Attention: in order t
ss of this
commit.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index c7aaa1c..f79c0e0 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -532,11 +532,11 @@ ifneq (,
Is it absolutely valid and possible to have cURL in generic
MinGW environment. Building Git without cURL is still possible
by passing NO_CURL=1
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.mak.uname b
On Mon, Sep 29, 2014 at 10:43:41PM +0200, Johannes Sixt wrote:
> Am 28.09.2014 um 15:24 schrieb Marat Radchenko:
> > This commit touches regcomp.c and poll.c from Gnulib,
> > both were fixed upstream in 2012 the same way.
> >
> > Wrt ShellExecute, see [1].
> >
Signed-off-by: Marat Radchenko
---
git-compat-util.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-compat-util.h b/git-compat-util.h
index 9d2d5ab..5f6659c 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -474,7 +474,7 @@ extern int git_munmap(void *start
-linux-gnu-
then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.
Signed-off-by: Marat Radchenko
---
Makefile | 19 +--
config.mak.uname | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index f34a2d4..
tic', so #undef MinGW-W64
version of FORCEINLINE.
Signed-off-by: Marat Radchenko
---
compat/nedmalloc/malloc.c.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index f216a2a..a6c8cac 100644
--- a/compat/ned
When crosscompiling, one cannot rely on `uname` from host system.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 5 +
1 file changed, 5 insertions(+)
diff --git a/config.mak.uname b/config.mak.uname
index 9f7037e..182da50 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -14,6
This commit touches regcomp.c and poll.c from Gnulib,
both were fixed upstream in 2012 the same way.
Wrt ShellExecute, see [1].
[1]: http://blogs.msdn.com/b/oldnewthing/archive/2006/11/08/1035971.aspx
Signed-off-by: Marat Radchenko
---
compat/mingw.c | 8
compat/poll/poll.c
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/compat/mingw.h b/comp
Is it absolutely valid and possible to have cURL in generic
MinGW environment. Building Git without cURL is still possible
by passing NO_CURL=1
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.mak.uname b
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64!).
*Compilation* tested on:
- MSVC (via WinGit environment)
- msysGit environment
- Linux cross-toolchain i686-pc-mingw32
- Linux cross-toolchain i686-w64-mingw32
- Linux cross-toolchain x86_64-w64-mingw32
Atte
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index a2f380f..20cbdcf 100644
--- a
Unlike MinGW, MinGW-W64 has CONSOLE_FONT_INFOEX already properly defined
in wincon.h.
Signed-off-by: Marat Radchenko
---
compat/winansi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compat/winansi.c b/compat/winansi.c
index efc5bb3..0ac3297 100644
--- a/compat/winansi.c
Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index df0e320..ed79368 100644
--- a/compat/mingw.h
+++ b/compat
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 948a174..d113b19 100644
ss of this
commit.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index c7aaa1c..f79c0e0 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -532,11 +532,11 @@ ifneq (,
From: Ray Donnelly
Signed-off-by: Ray Donnelly
Signed-off-by: Marat Radchenko
---
config.mak.uname | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 324a7fc..4470a928 100644
--- a/config.mak.uname
+++ b/config.mak.uname
of stdint.h but hopefully that is not a problem.
Signed-off-by: Marat Radchenko
---
compat/mingw.h| 2 --
compat/msvc.h | 3 +++
config.mak.uname | 3 ++-
git-compat-util.h | 11 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/compat/mingw.h b/compat/ming
On Tue, Sep 09, 2014 at 09:49:03AM -0700, Junio C Hamano wrote:
> Marat Radchenko writes:
>
> > Some time ago I complained [1] about troubles using Git
> > on a project with high ratio of non-programmers.
> > ...
> > Then, a lost'n'forgotten git_svn_server
Some time ago I complained [1] about troubles using Git
on a project with high ratio of non-programmers.
Since then, a conclusion was made: Git is too complex.
While Git provides many nice advanced stuff, its simplest
workflow isn't simple enough.
So we examined other options:
* Splitting proj
On Mon, May 19, 2014 at 11:49:09AM -0400, Jeff King wrote:
> On Mon, May 19, 2014 at 07:03:58PM +0400, Marat Radchenko wrote:
>
> > `git push` writes to stderr instead of stdout
>
> That's by design.
>
> Which one is correct is largely a matter of philosophy / menta
`git push` writes to stderr instead of stdout
Steps to reproduce:
mkdir foo
cd foo
git init
echo foo > fo
git add -A
git commit -am "foo"
git push . HEAD:refs/heads/newbranch 2>out
Expected: `out` file is empty
Actual: `out` file contents:
To .
* [new branch] HEAD -> newbra
On Sun, May 04, 2014 at 08:52:44PM +0200, Stepan Kasal wrote:
> Thank you very much for this analysis.
> It enables us to redirect you the third time: to report this as a
> bug in MinGW-W64 ! ;-)
I'll report this to MinGW-W64 soon, though even if/when they fix
the issue on their side, I'd still l
On Wed, Apr 30, 2014 at 10:35:56AM +0200, Karsten Blees wrote:
> Am 29.04.2014 11:12, schrieb Marat Radchenko:
> > On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function.
> > Fix `warning: passing argument 2 of 'mingw_main' from incompatible
> >
On Wed, Apr 30, 2014 at 01:41:25PM +0200, Stepan Kasal wrote:
> Hello,
>
> On Tue, Apr 29, 2014 at 01:12:04PM +0400, Marat Radchenko wrote:
> > On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI.
> >
> > Removal -DNOGDI=1 from config.mak.uname h
st bringing Karsten's patch
> > upstream with this patch.
> >
> > So yes, this is fine.
> >
> >> cc'ed to the usual suspects (Erik Faye-Lund, Dscho and J6t). Just
> >> like I do not have to ask "does this look ok?" question when see
Felipe Contreras wrote
> [PATCH v5 1/6] pull: rename pull.rename to pull.mode
s/pull.rename/pull.rebase/
--
View this message in context:
http://git.661346.n2.nabble.com/PATCH-v5-0-6-Reject-non-ff-pulls-by-default-tp7609118p7609129.html
Sent from the git mailing list archive at Nabble.com.
--
its lack of stdint.h but hopefully that is not a problem.
Signed-off-by: Marat Radchenko
---
compat/mingw.h| 2 --
compat/msvc.h | 3 +++
config.mak.uname | 3 ++-
git-compat-util.h | 11 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/compat/mingw.h b/com
Is it absolutely valid and possible to have cURL in generic
MinGW environment. Building Git without cURL is still possible
by passing NO_CURL=1
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.mak.uname b
ned-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 50c1114..b68a7d1 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -516,11 +516,11 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI.
Removal -DNOGDI=1 from config.mak.uname has an undesirable effect of
bringing in wingdi.h with weird #define ERROR 0 that conflicts with
internal Git enums. So, just #undef NOGDI in compat/poll/poll.c.
Signed-off-by: Marat
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 87d58ba..7e3d038 100644
tic', so #undef MinGW-W64
version of FORCEINLINE.
Signed-off-by: Marat Radchenko
---
compat/nedmalloc/malloc.c.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index f216a2a..a6c8cac 100644
--- a/compat/ned
When crosscompiling, one cannot rely on `uname` from host system.
Thus, add an option to use `make MINGW=1` for building MinGW build
from non-MinGW host (Linux, for example).
Signed-off-by: Marat Radchenko
---
config.mak.uname | 5 +
1 file changed, 5 insertions(+)
diff --git a
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index 23a8803..faddb82 100644
--- a
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/compat/mingw.h b/comp
On MinGW, compat/mingw.h defines a 'mingw_main' wrapper function.
Fix `warning: passing argument 2 of 'mingw_main' from incompatible
pointer type` in http-fetch.c and remote-curl.c by dropping 'const'.
Signed-off-by: Marat Radchenko
---
http-fetch.c | 5 +++--
Differences with v1:
- Dropped "MINGW: compat/bswap.h: include stdint.h", it isn't needed after
"MINGW: git-compat-util.h: use inttypes.h for printf macros"
- Split "MINGW: config.mak.uname allow using CURL for non-msysGit builds"
into "MINGW: config.mak.uname: allow using cURL for non-msys
Unlike MinGW, MinGW-W64 has lseek already properly defined in io.h.
Signed-off-by: Marat Radchenko
Acked-by: Eric Faye-Lund
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index e033e72..262b300 100644
--- a/compat/mingw.h
+++ b/compat
-linux-gnu-
then the compiler will be 'gcc', not 'ia64-linux-gnu-gcc'.
Signed-off-by: Marat Radchenko
---
Makefile | 19 +--
config.mak.uname | 2 +-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 74a929b..
On Mon, Apr 28, 2014 at 05:23:25PM +0200, Erik Faye-Lund wrote:
> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko
> wrote:
> > nedalloc was initially added in f0ed82 to fix slowness of standard WinXP
> > memory allocator. Since WinXP is EOLed, this point is no longer valid.
On Mon, Apr 28, 2014 at 01:45:04PM -0700, Jonathan Nieder wrote:
> I'm not really sure what in particular you're pointing to in that
> page. If you have a more specific question about what '?=' means,
> could you say it?
Woops. I guess I need some sleep. Confused '?=' with ':='.
--
To unsubscribe
On Mon, Apr 28, 2014 at 09:25:36AM -0700, Jonathan Nieder wrote:
> > -STRIP ?= strip
> > +STRIP = $(CROSS_COMPILE)strip
>
> Before, STRIP from the environment took precedence over STRIP from the
> makefile. Switching to the more usual 'environment can't be trusted'
> convention is a good change,
On Mon, Apr 28, 2014 at 12:37:42PM -0500, Felipe Contreras wrote:
> > +CC = $(CROSS_COMPILE)cc
>
> Nice.
Actually, not. You still have to override CC because it is
$(CROSS_COMPILE)*g*cc. Any thoughts how to handle this?
> > - RC = windres -O coff
> > + RC = $(CROSS_COMPILE)windres -O coff
>
On Mon, Apr 28, 2014 at 05:17:25PM +0200, Erik Faye-Lund wrote:
> > 1. What are other ways to provide iconv on MinGW?
>
> I'm not sure I understand. To set HAVE_LIBCHARSET_H, we need to have
> libcharset.h. MinGW doesn't supply by default to my knowledge, so we
> get it from iconv. The THIS_IS_MSY
On Mon, Apr 28, 2014 at 05:26:38PM +0200, Erik Faye-Lund wrote:
> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko
> wrote:
> > Also, fix `warning: passing argument 2 of 'mingw_main' from
> > incompatible pointer type` in http-fetch.c and remote-curl.c.
>
>
> Did you measure that malloc on newer Windows-versions are actually faster?
No, I didn't. As I said, real reason for this patch is that Git version of
nedalloc fails to compile under MinGW-W64. If we still want to use nedalloc
under MinGW, this patch should be replaced with:
a) Updating nedal
On Mon, Apr 28, 2014 at 05:02:09PM +0200, Erik Faye-Lund wrote:
> msysGit has a declaration of it in io.h as well. But it's not a
> preprocessor-definition... Are you saying that it's a
> preprocessor-define in mingw-w64, that points to a 64-bit version? If
> so, looks good.
MinGW is x86 only.
Mi
On Mon, Apr 28, 2014 at 04:58:11PM +0200, Erik Faye-Lund wrote:
> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko
> wrote:
> > HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to
> > msysGit, they're general MinGW settings.
>
> Actually, HAVE_LIBCHARSET_H
On Mon, Apr 28, 2014 at 04:53:52PM +0200, Erik Faye-Lund wrote:
> Just checking that I understand: Does this mean that we now require an
> MSVC-version that has stdint.h? If so, I'm not against such a case.
> IMO, the biggest benefit of using MSVC is not building on legacy
> systems, but being able
On Mon, Apr 28, 2014 at 04:45:43PM +0200, Erik Faye-Lund wrote:
> bswap.h is included after stdint.h from git-compat-util.h anyway...
That only becomes true after PATCH 05 when talking about MinGW.
Will drop this one.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body o
This patch series fixes building on modern MinGW and (32bit only yet) MinGW-W64.
*Compilation* tested on:
- MSVC (via WinGit environment)
- msysGit environment
- Linux cross-toolchain i686-pc-mingw32 (4.8.2) with mingw-runtime-3.20.2
- Linux cross-toolchain i686-w64-mingw32 (4.8.2) with mingw6
pid_t is available in sys/types.h on both MinGW and MinGW-W64
Signed-off-by: Marat Radchenko
---
compat/mingw.h | 1 -
compat/msvc.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index c502a22..8850109 100644
--- a/compat/mingw.h
+++ b
fork() is not used in MinGW builds but causes a compiler warning
on x86_64 MinGW-W64: conflicting types for built-in function 'fork'
Signed-off-by: Marat Radchenko
---
compat/mingw.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 885010
newer.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 2 --
1 file changed, 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 4883fd5..3fea7a8 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -342,7 +342,6 @@ ifeq ($(uname_S),Windows
mingw-w64 has lseek defined in io.h.
Signed-off-by: Marat Radchenko
---
compat/mingw.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/mingw.h b/compat/mingw.h
index e033e72..262b300 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -265,7 +265,9 @@ static inline int getrlimit
-D__USE_MINGW_ACCESS only affects MinGW and does nothing when
MSVC is used.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.mak.uname b/config.mak.uname
index e5edae6..dc87e21 100644
--- a/config.mak.uname
+++ b
On MinGW-W64, MsgWaitForMultipleObjects is guarded with #ifndef NOGDI.
Unfortunately, including wingdi.h brings in #define ERROR 0 which
conflicts with several Git internal enums. So, #undef ERROR.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
git-compat-util.h | 2 ++
2 files
Also, fix `warning: passing argument 2 of 'mingw_main' from
incompatible pointer type` in http-fetch.c and remote-curl.c.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 2 --
http-fetch.c | 5 +++--
remote-curl.c| 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
To ease cross-compilation process, introduce a single variable
with the prefix to all compiler-related executables.
Signed-off-by: Marat Radchenko
---
Makefile | 13 +
config.mak.uname | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/Makefile b
HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to
msysGit, they're general MinGW settings.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index dc87e21..2f1939e 1
Also, pass -D__USE_MINGW_ANSI_STDIO=0 to select MSVCRT-compatible
macro definitions.
Signed-off-by: Marat Radchenko
---
compat/mingw.h| 2 --
compat/msvc.h | 3 +++
config.mak.uname | 3 ++-
git-compat-util.h | 11 ++-
4 files changed, 11 insertions(+), 8 deletions(-)
diff
bswap.h uses uint32_t type which might not be defined.
This patch adds direct include so bswap.h can be safely included.
Signed-off-by: Marat Radchenko
---
compat/bswap.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat/bswap.h b/compat/bswap.h
index 120c6c1..d170447 100644
--- a
1 - 100 of 128 matches
Mail list logo