- migrate to apache 2.4

[packages/cgit.git] / cgit-system-git.patch

diff --git a/cgit-system-git.patch b/cgit-system-git.patch
index 33f2991ad26ab01ad944f13ed272c95026c6d996..359ffe472a076325162a55788d1e7f3f2d85a35f 100644 (file)
--- a/cgit-system-git.patch
+++ b/cgit-system-git.patch
@@ -1,25 +1,24 @@
-diff -burN cgit-0.8.1.orig/Makefile cgit-0.8.1/Makefile
---- cgit-0.8.1.orig/Makefile   2008-12-10 09:59:24.000000000 +0100
-+++ cgit-0.8.1/Makefile        2008-12-10 10:03:03.000000000 +0100
-@@ -6,6 +6,7 @@
- SHA1_HEADER = <openssl/sha.h>
- GIT_VER = 1.6.0.2
+--- cgit-0.8.3.4/Makefile.orig 2010-09-27 08:00:47.000000000 +0200
++++ cgit-0.8.3.4/Makefile      2010-10-14 01:24:36.000000000 +0200
+@@ -8,6 +8,7 @@
+ GIT_VER = 1.7.3
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+ INSTALL = install
 +LIBDIR = /usr/lib
  
+ # Define NO_STRCASESTR if you don't have strcasestr.
  #
- # Let the user override the above settings.
-@@ -46,7 +47,7 @@
+@@ -68,7 +69,7 @@
        $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
  
  
--EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
-+EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto
+-EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto -lpthread
++EXTLIBS = $(LIBDIR)/libgit.a $(LIBDIR)/libgit_xdiff.a -lz -lcrypto -lpthread
  OBJECTS =
  OBJECTS += cache.o
  OBJECTS += cgit.o
-@@ -97,17 +98,13 @@
-       CFLAGS += -DNO_ICONV
+@@ -124,17 +125,13 @@
+       CFLAGS += -DNO_STRCASESTR
  endif
  
 -cgit: $(OBJECTS) libgit
@@ -31,8 +30,8 @@ diff -burN cgit-0.8.1.orig/Makefile cgit-0.8.1/Makefile
  -include $(OBJECTS:.o=.d)
  
 -libgit:
--      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) libgit.a
--      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) xdiff/lib.a
+-      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 libgit.a
+-      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) NO_CURL=1 xdiff/lib.a
 -
  test: all
        $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all