Merge pull request #205 from phhusson/fix-docker

[termux-packages] / packages / git / makefile.patch

diff --git a/packages/git/makefile.patch b/packages/git/makefile.patch
index d8e91db..771348a 100644 (file)
--- a/packages/git/makefile.patch
+++ b/packages/git/makefile.patch
@@ -1,7 +1,13 @@
-diff -u -r ../git-2.5.0/Makefile ./Makefile
---- ../git-2.5.0/Makefile      2015-07-27 16:34:56.000000000 -0400
-+++ ./Makefile 2015-07-30 03:43:04.011455306 -0400
-@@ -1431,7 +1431,6 @@
+The librt functionality is built into libc on Android.
+
+The Termux git package installs git perl files to $PREFIX/share/git-perl
+by patching perl/Makefile.PL, so setup that path when building perl
+files in this Makefile.
+
+diff -u -r ../git-2.7.4/Makefile ./Makefile
+--- ../git-2.7.4/Makefile      2016-03-17 16:47:59.000000000 -0400
++++ ./Makefile 2016-03-24 22:46:20.335193973 -0400
+@@ -1455,7 +1455,6 @@
  
  ifdef HAVE_CLOCK_GETTIME
        BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
@@ -9,12 +15,12 @@ diff -u -r ../git-2.5.0/Makefile ./Makefile
  endif
  
  ifdef HAVE_CLOCK_MONOTONIC
-@@ -1699,7 +1698,7 @@
- common-cmds.h: generate-cmdlist.perl command-list.txt
- 
- common-cmds.h: $(wildcard Documentation/git-*.txt)
--      $(QUIET_GEN)$(PERL_PATH) generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
-+      $(QUIET_GEN)perl generate-cmdlist.perl command-list.txt > $@+ && mv $@+ $@
- 
- SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
-       $(localedir_SQ):$(NO_CURL):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
+@@ -1789,7 +1788,7 @@
+       sed -e '1{' \
+           -e '        s|#!.*perl|#!$(PERL_PATH_SQ)|' \
+           -e '        h' \
+-          -e '        s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"$$INSTLIBDIR"'"));=' \
++          -e '        s=.*=use lib (split(/$(pathsep)/, $$ENV{GITPERLLIB} || "'"@TERMUX_PREFIX@/share/git-perl"'"));=' \
+           -e '        H' \
+           -e '        x' \
+           -e '}' \