Mike Gorchak <mike.gorchak....@gmail.com> writes:

> Add pthread support in QNX. Do not declare NO_ macros if they can be
> autodetected.
> From: Mike Gorchak <mike.gorchak....@gmail.com>
> Signed-off-by: Mike Gorchak <mike.gorchak....@gmail.com>

One procedural nit.  Please drop that "From:" immediately before
S-o-b: from future submissions (I'll remove it locally for this
patch and others you already posted when I apply, so this alone is
not a reason to resend them).  If you are forwarding somebody else's
patch, you would want "From:" in body, but the correct place to do
so is before everything else, i.e.

        ... your e-mail headers ...
        From: Mike Gorchak <your.em...@address.xz>
        Subject: [PATCH] title of the patch

        ... your e-mail body ...
        From: A U Thor <real.aut...@address.xz>

        The first line of the commit log message and
        the second line of it.

        Signed-off-by: A U Thor <real.aut...@address.xz>
        Signed-off-by: Mike Gorchak <your.em...@address.xz>

Also, please leave the "autodetection" out.  If it is common to have
strcasestr (or any other) on a newer QNX, then not defining the
symbol NO_STRCASESTR in this file may still be the right thing to
do, but the justification for such a change should not be because we
rely on "autodetection".  The defaults given in config.mak.uname is
primarily for people who do not use the optional ./configure script,
so pick the default to help the most common configuration for the

I'd rewrite the patch like the attached, and tentatively queue the
patch to 'pu', but I do not use or have access to QNX myself, so you
may have to adjust the default set of symbols and the log message
and in such a case, please do re-submit a fixed version.

Specifically, I do not know if "... and others are also supported"
is universally true with QNX 6; if not, we need to define NO_* for
them to help people who build without using the ./configure script.


-- >8 --
From: Mike Gorchak <mike.gorchak....@gmail.com>
Date: Mon, 25 Feb 2013 10:39:27 +0200
Subject: [PATCH] QNX: newer QNX 6.x.x is not so crippled

The initial port to QNX declared that the platform does not have
support for pthreads, getpagesize, strcasestr, mkstemps, mkdtemp,
strlcpy, and iconv, but QNX 6.x.x does support these.

On the other hand, older QNX lack gettext support, so define
NO_GETTEXT for them.

Also newer QNX do not need to link to any special library to enable
pthreads; define PTHREAD_LIBS to an empty string.

Signed-off-by: Mike Gorchak <mike.gorchak....@gmail.com>
Signed-off-by: Junio C Hamano <gits...@pobox.com>
 config.mak.uname | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/config.mak.uname b/config.mak.uname
index 8743a6d..ce2832b 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -527,14 +527,21 @@ ifeq ($(uname_S),QNX)
        HAVE_STRINGS_H = YesPlease
        NEEDS_SOCKET = YesPlease
        NO_FNMATCH_CASEFOLD = YesPlease
-       NO_GETPAGESIZE = YesPlease
-       NO_ICONV = YesPlease
        NO_MEMMEM = YesPlease
-       NO_MKDTEMP = YesPlease
-       NO_MKSTEMPS = YesPlease
        NO_NSEC = YesPlease
-       NO_PTHREADS = YesPlease
        NO_R_TO_GCC_LINKER = YesPlease
-       NO_STRCASESTR = YesPlease
-       NO_STRLCPY = YesPlease
+       # All QNX 6.x versions have pthread functions in libc;
+       # getpagesize and others are also supported.
+       ifeq ($(shell expr "$(uname_R)" : '6\.[0-9]\.[0-9]'),5)
+               PTHREAD_LIBS = ""
+       else
+               NO_PTHREADS = YesPlease
+               NO_GETPAGESIZE = YesPlease
+               NO_STRCASESTR = YesPlease
+               NO_MKSTEMPS = YesPlease
+               NO_MKDTEMP = YesPlease
+               NO_STRLCPY = YesPlease
+               NO_ICONV = YesPlease
+               NO_GETTEXT = YesPlease
+       endif

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to