mdw@git.distorted.org.uk Git - termux-packages/blob - packages/git/git.patch

   1 * Set uname_S to Linux instead of detecting build machine.
   2 * Fix ST_CTIME_NSEC and ST_MTIME_NSEC macros on Android.
   3
   4 diff -u -r ../git-1.8.5.3/config.mak.uname ./config.mak.uname
   5 --- ../git-1.8.5.3/config.mak.uname     2014-01-14 18:10:09.000000000 +0100
   6 +++ ./config.mak.uname  2014-01-22 16:53:42.000000000 +0100
   7 @@ -1,6 +1,6 @@
   8  # Platform specific Makefile tweaks based on uname detection
   9
  10 -uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
  11 +uname_S := Linux
  12  uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
  13  uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
  14  uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
  15 diff -u -r ../git-1.8.5.3/git-compat-util.h ./git-compat-util.h
  16 --- ../git-1.8.5.3/git-compat-util.h    2014-01-14 18:10:09.000000000 +0100
  17 +++ ./git-compat-util.h 2014-01-22 13:07:19.000000000 +0100
  18 @@ -657,6 +657,10 @@
  19  # define FORCE_DIR_SET_GID 0
  20  #endif
  21
  22 +#ifdef __ANDROID__
  23 +#define ST_CTIME_NSEC(st) ((unsigned int)((st).st_ctime_nsec))
  24 +#define ST_MTIME_NSEC(st) ((unsigned int)((st).st_mtime_nsec))
  25 +#else
  26  #ifdef NO_NSEC
  27  #undef USE_NSEC
  28  #define ST_CTIME_NSEC(st) 0
  29 @@ -670,6 +674,7 @@
  30  #define ST_MTIME_NSEC(st) ((unsigned int)((st).st_mtim.tv_nsec))
  31  #endif
  32  #endif
  33 +#endif
  34
  35  #ifdef UNRELIABLE_FSTAT
  36  #define fstat_is_reliable() 0
  37