X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcgit.git;a=blobdiff_plain;f=cgit-system-git.patch;h=f0275e0ff5904f102c2743e1440a76bea3d17f0a;hp=359ffe472a076325162a55788d1e7f3f2d85a35f;hb=0735334ad4c8ab0d5349482caabb4762d0c354ad;hpb=18ab1fdd42883002676bed955eaf027ef890f8a7

diff --git a/cgit-system-git.patch b/cgit-system-git.patch
index 359ffe4..f0275e0 100644
--- a/cgit-system-git.patch
+++ b/cgit-system-git.patch
@@ -1,38 +1,12 @@
---- 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.
- #
-@@ -68,7 +69,7 @@
- 	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
- 
- 
--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
-@@ -124,17 +125,13 @@
- 	CFLAGS += -DNO_STRCASESTR
- endif
- 
--cgit: $(OBJECTS) libgit
-+cgit: $(OBJECTS)
- 	$(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o cgit $(OBJECTS) $(EXTLIBS)
- 
- cgit.o: VERSION
- 
- -include $(OBJECTS:.o=.d)
- 
--libgit:
--	$(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
- 
+diff -uNr cgit-0.10.old/cgit.mk cgit-0.10/cgit.mk
+--- cgit-0.10.old/cgit.mk	2014-01-17 16:09:16.000000000 +0100
++++ cgit-0.10/cgit.mk	2014-02-25 15:22:09.208586612 +0100
+@@ -130,6 +130,7 @@
+ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
+ 	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
+ 
+-$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
++LIBS = -lgit -lgit_xdiff $(EXTLIBS)
++$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS
+ 	@echo 1>&1 "    * $(LUA_MESSAGE)"
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)