All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Do not build i18n on Windows.
Date: Sat, 14 Aug 2010 00:02:40 +0200	[thread overview]
Message-ID: <201008140002.40587.j6t@kdbg.org> (raw)

We do not have the necessary libraries and tools.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 It is necessary to move the first check for NO_GETTEXT after the
 configuration section.

 NEEDS_LIBINTL receives a default setting before the configuration
 section (not visible in the patch text), hence, I have to unset it
 when NO_GETTEXT is set. Perhaps you have a better idea to arrange
 these settings.

 -- Hannes

 Makefile |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index cdb8222..48cf304 100644
--- a/Makefile
+++ b/Makefile
@@ -598,9 +598,6 @@ LIB_OBJS += entry.o
 LIB_OBJS += environment.o
 LIB_OBJS += exec_cmd.o
 LIB_OBJS += fsck.o
-ifndef NO_GETTEXT
-LIB_OBJS += gettext.o
-endif
 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
 LIB_OBJS += hash.o
@@ -1100,6 +1097,7 @@ ifeq ($(uname_S),Windows)
 	NO_PYTHON = YesPlease
 	BLK_SHA1 = YesPlease
 	NATIVE_CRLF = YesPlease
+	NO_GETTEXT = YesPlease
 
 	CC = compat/vcbuild/scripts/clink.pl
 	AR = compat/vcbuild/scripts/lib.pl
@@ -1150,6 +1148,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	NO_REGEX = YesPlease
 	NO_PYTHON = YesPlease
 	BLK_SHA1 = YesPlease
+	NO_GETTEXT = YesPlease
 	COMPAT_CFLAGS 
+= -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
 	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o \
@@ -1499,6 +1498,9 @@ endif
 
 ifdef NO_GETTEXT
 	COMPAT_CFLAGS += -DNO_GETTEXT
+	NEEDS_LIBINTL =
+else
+	LIB_OBJS += gettext.o
 endif
 
 ifdef NEEDS_LIBINTL
-- 
1.7.1.402.gf1eeb

             reply	other threads:[~2010-08-13 22:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-13 22:02 Johannes Sixt [this message]
2010-08-13 22:19 ` [PATCH] Do not build i18n on Windows Ævar Arnfjörð Bjarmason
2010-08-14  8:24   ` 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=201008140002.40587.j6t@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    /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.