From: Junio C Hamano <gitster@pobox.com>
To: Matt Kraai <kraai@ftbfs.org>
Cc: git@vger.kernel.org, Matt Kraai <matt.kraai@amo.abbott.com>
Subject: Re: [PATCH] Include xmlparse.h instead of expat.h on QNX
Date: Mon, 11 Feb 2013 13:34:52 -0800 [thread overview]
Message-ID: <7vip5ylekj.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1360616395-18912-1-git-send-email-kraai@ftbfs.org> (Matt Kraai's message of "Mon, 11 Feb 2013 12:59:55 -0800")
Matt Kraai <kraai@ftbfs.org> writes:
> From: Matt Kraai <matt.kraai@amo.abbott.com>
>
> QNX 6.3.2 through 6.5.0 include Expat 1.1, which provides xmlparse.h
> instead of expat.h, so include the former on QNX systems.
>
> Signed-off-by: Matt Kraai <matt.kraai@amo.abbott.com>
> ---
Two points and a possibly irrelevant half:
- If a fix is platform specific (i.e. tempts to use #ifdef
PLATFORM_NAME), we would prefer to see a patch that that is
isolated to platform-specific compatibility layer, which would
involve:
. add compat/qnx/expat.h file that #include <xmlparse.h>
. to Makefile, add -Icompat/qnx/ to CFLAGS
- Is this really a fix for a problem specific to QNX? It looks
like this is for any platform with expat 1, no?
- What happens to people with QNX older than 6.3.2 or newer than
6.5.0 (assuming they will eventually start shipping expat 2) with
your patch?
Assuming that this change is about building with expat1, it would
probably be better to do something like this instead, I would think.
Makefile | 5 +++++
config.mak.uname | 1 +
http-push.c | 4 ++++
3 files changed, 10 insertions(+)
diff --git a/Makefile b/Makefile
index 5a2e02d..57032cc 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,8 @@ all::
# Define EXPATDIR=/foo/bar if your expat header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
#
+# Define EXPAT_VERSION=1 if you are trying to build with expat 1.x (e.g. QNX).
+#
# Define NO_GETTEXT if you don't want Git output to be translated.
# A translated Git requires GNU libintl or another gettext implementation,
# plus libintl-perl at runtime.
@@ -1089,6 +1091,9 @@ else
else
EXPAT_LIBEXPAT = -lexpat
endif
+ ifdef EXPAT_VERSION
+ BASIC_CFLAGS += -DEXPAT_VERSION=$(EXPAT_VERSION)
+ endif
endif
endif
diff --git a/config.mak.uname b/config.mak.uname
index bea34f0..281d834 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -536,4 +536,5 @@ ifeq ($(uname_S),QNX)
NO_R_TO_GCC_LINKER = YesPlease
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
+ EXPAT_VERSION = 1
endif
diff --git a/http-push.c b/http-push.c
index 3e72e84..2fdb0cd 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,11 @@
#include "list-objects.h"
#include "sigchain.h"
+#if EXPAT_VERSION == 1
+#include <xmlparse.h>
+#else
#include <expat.h>
+#endif
static const char http_push_usage[] =
"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
next prev parent reply other threads:[~2013-02-11 21:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 20:59 [PATCH] Include xmlparse.h instead of expat.h on QNX Matt Kraai
2013-02-11 21:06 ` Jeff King
2013-02-11 21:24 ` Matt Kraai
2013-02-11 22:03 ` [PATCH] Allow building with xmlparse.h Matt Kraai
2013-02-11 22:11 ` Junio C Hamano
2013-02-11 22:30 ` Matt Kraai
2013-02-11 22:35 ` Junio C Hamano
2013-02-11 21:41 ` [PATCH] Include xmlparse.h instead of expat.h on QNX Junio C Hamano
2013-02-11 21:34 ` Junio C Hamano [this message]
2013-02-11 21:49 ` Matt Kraai
2013-02-11 21:53 ` Junio C Hamano
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=7vip5ylekj.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kraai@ftbfs.org \
--cc=matt.kraai@amo.abbott.com \
/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.