On January 24, 2018 4:19 PM, Junio C Hamano wrote:
>
> randall.s.becker@xxxxxxxxxx writes:
>
> > From: "Randall S. Becker" <rsbecker@xxxxxxxxxxxxx>
> >
> > Upgrade old options in config.mak.uname to currently supported NonStop
> > operating system versions (J06.21 and L17.xx).
> >
> > Signed-off-by: Randall S. Becker <rsbecker@xxxxxxxxxxxxx>
> > ---
> > config.mak.uname | 29 +++++++++++++++++++++--------
> > 1 file changed, 21 insertions(+), 8 deletions(-)
>
> The "tar extraction option" thing in 1/4 is not something you use here?
Not
> complaining---I am merely trying to use this as one data point to help me
> assess/guess what 1/4 is about ;-)
The define is used only in my team's distribution engine and we are planning
to override the define as part of our Jenkins build of git. We do not expect
anyone else who clones git and builds on the platform to use this
capability. As a result, I did not want it to be defaulted as "ov", which is
our setting.
>
> >
> > diff --git a/config.mak.uname b/config.mak.uname index
> > 685a80d13..d9f8d57e3 100644
> > --- a/config.mak.uname
> > +++ b/config.mak.uname
> > @@ -428,27 +428,37 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
> > # INLINE='' would just replace one set of warnings with another and
> > # still not compile in c89 mode, due to non-const array
initializations.
> > CC = cc -c99
> > + # Build down-rev compatible objects that don't use our new
> getopt_long.
> > + ifeq ($(uname_R).$(uname_V),J06.21)
> > + CC += -WRVU=J06.20
> > + endif
> > + ifeq ($(uname_R).$(uname_V),L17.02)
> > + CC += -WRVU=L16.05
> > + endif
> > # Disable all optimization, seems to result in bad code, with -O or
-O2
> > # or even -O1 (default),
/usr/local/libexec/git-core/git-pack-objects
> > # abends on "git push". Needs more investigation.
> > - CFLAGS = -g -O0
> > + CFLAGS = -g -O0 -Winline
> > # We'd want it to be here.
> > prefix = /usr/local
> > # Our's are in ${prefix}/bin (perl might also be in /usr/bin/perl).
> > - PERL_PATH = ${prefix}/bin/perl
> > - PYTHON_PATH = ${prefix}/bin/python
> > -
> > + PERL_PATH = /usr/bin/perl
> > + PYTHON_PATH = /usr/bin/python
> > + RM = /bin/rm -f
> > # As detected by './configure'.
> > # Missdetected, hence commented out, see below.
> > #NO_CURL = YesPlease
> > # Added manually, see above.
> > NEEDS_SSL_WITH_CURL = YesPlease
> > + NEEDS_CRYPTO_WITH_SSL = YesPlease
> > + HAVE_DEV_TTY = YesPlease
> > HAVE_LIBCHARSET_H = YesPlease
> > HAVE_STRINGS_H = YesPlease
> > NEEDS_LIBICONV = YesPlease
> > NEEDS_LIBINTL_BEFORE_LIBICONV = YesPlease
> > NO_SYS_SELECT_H = UnfortunatelyYes
> > NO_D_TYPE_IN_DIRENT = YesPlease
> > + NO_GETTEXT = YesPlease
> > NO_HSTRERROR = YesPlease
> > NO_STRCASESTR = YesPlease
> > NO_MEMMEM = YesPlease
> > @@ -458,8 +468,13 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
> > NO_MKDTEMP = YesPlease
> > # Currently libiconv-1.9.1.
> > OLD_ICONV = UnfortunatelyYes
> > - NO_REGEX = YesPlease
> > + NO_REGEX=NeedsStartEnd
> > NO_PTHREADS = UnfortunatelyYes
> > + ifdef NO_PTHREADS
> > + else # WIP, use Posix User Threads
> > + PTHREAD_CFLAGS = -D_PUT_MODEL_ -I/usr/include
> > + PTHREAD_LIBS = -lput
> > + endif
> >
> > # Not detected (nor checked for) by './configure'.
> > # We don't have SA_RESTART on NonStop, unfortunalety.
> > @@ -477,9 +492,7 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
> > # RFE 10-120912-4693 submitted to HP NonStop development.
> > NO_SETITIMER = UnfortunatelyYes
> > SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
> > - SHELL_PATH = /usr/local/bin/bash
> > - # as of H06.25/J06.14, we might better use this
> > - #SHELL_PATH = /usr/coreutils/bin/bash
> > + SHELL_PATH = /usr/coreutils/bin/bash
> > endif
> > ifneq (,$(findstring MINGW,$(uname_S)))
> > pathsep = ;
