development/scm/git/v2.12.2-aros.diff

   1 diff -ruN -X ./exclude.patterns git-2.12.2/config.mak.uname git-2.12.2.aros/config.mak.uname
   2 --- git-2.12.2/config.mak.uname 2017-03-24 19:59:15.000000000 +0000
   3 +++ git-2.12.2.aros/config.mak.uname    2017-04-13 01:28:37.611201471 +0100
   4 @@ -17,6 +17,21 @@
   5  # because maintaining the nesting to match is a pain.  If
   6  # we had "elif" things would have been much nicer...
   7
   8 +ifeq ($(uname_S),AROS)
   9 +       BASIC_CFLAGS += -D__BSD_VISIBLE
  10 +       NO_CURL = YesPlease
  11 +       BLK_SHA1 = YesPlease
  12 +       NO_LIBGEN_H = YesPlease
  13 +       # Copied from Windows
  14 +       NO_REGEX = YesPlease
  15 +       NO_GETTEXT = YesPlease
  16 +       NO_PYTHON = YesPlease
  17 +       # Copied from NONSTOP_KERNEL
  18 +       NO_NSEC = YesPlease
  19 +       NO_PREAD = YesPlease
  20 +       NO_MMAP = YesPlease
  21 +       NO_POLL = YesPlease
  22 +endif
  23  ifeq ($(uname_S),OSF1)
  24         # Need this for u_short definitions et al
  25         BASIC_CFLAGS += -D_OSF_SOURCE
  26 diff -ruN -X ./exclude.patterns git-2.12.2/git-compat-util.h git-2.12.2.aros/git-compat-util.h
  27 --- git-2.12.2/git-compat-util.h        2017-03-24 19:59:15.000000000 +0000
  28 +++ git-2.12.2.aros/git-compat-util.h   2017-04-13 01:19:35.059416877 +0100
  29 @@ -180,11 +180,13 @@
  30  #include <regex.h>
  31  #include <utime.h>
  32  #include <syslog.h>
  33 +#ifndef __AROS__
  34  #ifndef NO_SYS_POLL_H
  35  #include <sys/poll.h>
  36  #else
  37  #include <poll.h>
  38  #endif
  39 +#endif /* !__AROS__ */
  40  #ifdef HAVE_BSD_SYSCTL
  41  #include <sys/sysctl.h>
  42  #endif