From: Johannes Sixt <j6t@kdbg.org>
To: Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 1/5] config.mak.uname: support MSys2
Date: Thu, 14 Jan 2016 22:45:15 +0100 [thread overview]
Message-ID: <569816EB.1060607@kdbg.org> (raw)
In-Reply-To: <e63d391a79396e095d2ebb139bb44c390e50bb62.1452790142.git.johannes.schindelin@gmx.de>
Am 14.01.2016 um 17:51 schrieb Johannes Schindelin:
> diff --git a/config.mak.uname b/config.mak.uname
> index f34dcaa..b0592c1 100644
> --- a/config.mak.uname
> +++ b/config.mak.uname
> @@ -518,7 +518,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
> NO_INET_NTOP = YesPlease
> NO_POSIX_GOODIES = UnfortunatelyYes
> DEFAULT_HELP_FORMAT = html
> - COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
> + COMPAT_CFLAGS += -D_USE_32BIT_TIME_T -DNOGDI -Icompat -Icompat/win32
> COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
> COMPAT_OBJS += compat/mingw.o compat/winansi.o \
> compat/win32/pthread.o compat/win32/syslog.o \
> @@ -541,8 +541,25 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
> INTERNAL_QSORT = YesPlease
> HAVE_LIBCHARSET_H = YesPlease
> NO_GETTEXT = YesPlease
> + COMPAT_CLFAGS += -D__USE_MINGW_ACCESS
> else
> - NO_CURL = YesPlease
> + ifeq ($(shell expr "$(uname_R)" : '2\.'),2)
> + # MSys2
> + CC = gcc
> + prefix = /mingw32
Hmm. Setting the prefix like this is certainly ideal for Git for Windows
(the installer), but it is very uncommon to set the prefix in
config.mak.uname.
> + COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0
> + INSTALL = /bin/install
> + NO_R_TO_GCC_LINKER = YesPlease
> + INTERNAL_QSORT = YesPlease
> + HAVE_LIBCHARSET_H = YesPlease
> + NO_GETTEXT = YesPlease
> + USE_LIBPCRE= YesPlease
> + NO_CURL =
> + USE_NED_ALLOCATOR = YesPlease
USE_NED_ALLOCATOR is already set in the common section (line 510).
> + else
> + COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
Did you mean to set -D__USE_MINGW_ACCESS here? But, as I noticed, it
doesn't make a whole lot of a difference; my build (which picks this
branch, if I'm not mistaken) still passes the test suite.
> + NO_CURL = YesPlease
> + endif
> endif
> endif
> ifeq ($(uname_S),QNX)
>
-- Hannes
next prev parent reply other threads:[~2016-01-14 21:45 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 13:30 [PATCH 0/5] Fix compile errors with MSys2 Johannes Schindelin
2016-01-13 13:30 ` [PATCH 1/5] config.mak.uname: support MSys2 Johannes Schindelin
2016-01-13 16:11 ` Jeff King
2016-01-13 16:45 ` Johannes Schindelin
2016-01-13 19:23 ` Dennis Kaarsemaker
2016-01-13 13:31 ` [PATCH 2/5] config.mak.uname: supporting 64-bit MSys2 Johannes Schindelin
2016-01-21 10:36 ` SZEDER Gábor
2016-01-21 13:51 ` Johannes Schindelin
2016-01-13 13:31 ` [PATCH 3/5] nedmalloc: allow compiling with MSys2's compiler Johannes Schindelin
2016-01-13 19:28 ` Junio C Hamano
2016-01-13 13:31 ` [PATCH 4/5] compat/mingw: support MSys2-based MinGW build Johannes Schindelin
2016-01-13 13:31 ` [PATCH 5/5] compat/winansi: support compiling with MSys2 Johannes Schindelin
2016-01-13 19:31 ` [PATCH 0/5] Fix compile errors " Junio C Hamano
2016-01-14 6:53 ` Johannes Schindelin
2016-01-14 16:51 ` [PATCH v2 " Johannes Schindelin
2016-01-14 16:51 ` [PATCH v2 1/5] config.mak.uname: support MSys2 Johannes Schindelin
2016-01-14 21:45 ` Johannes Sixt [this message]
2016-01-14 16:51 ` [PATCH v2 2/5] config.mak.uname: supporting 64-bit MSys2 Johannes Schindelin
2016-01-14 16:51 ` [PATCH v2 3/5] nedmalloc: allow compiling with MSys2's compiler Johannes Schindelin
2016-01-14 16:51 ` [PATCH v2 4/5] compat/mingw: support MSys2-based MinGW build Johannes Schindelin
2016-01-14 16:52 ` [PATCH v2 5/5] compat/winansi: support compiling with MSys2 Johannes Schindelin
2016-01-14 20:21 ` [PATCH v2 0/5] Fix compile errors " Junio C Hamano
2016-01-14 21:57 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=569816EB.1060607@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.