- specify explicitly which lua version should be used

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

diff --git a/cgit-system-git.patch b/cgit-system-git.patch
index 33f2991ad26ab01ad944f13ed272c95026c6d996..f0275e0ff5904f102c2743e1440a76bea3d17f0a 100644 (file)
--- a/cgit-system-git.patch
+++ b/cgit-system-git.patch
@@ -1,39 +1,12 @@
-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
- GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
-+LIBDIR = /usr/lib
- 
- #
- # Let the user override the above settings.
-@@ -46,7 +47,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
- OBJECTS =
- OBJECTS += cache.o
- OBJECTS += cgit.o
-@@ -97,17 +98,13 @@
-       CFLAGS += -DNO_ICONV
- 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) libgit.a
--      $(QUIET_SUBDIR0)git $(QUIET_SUBDIR1) 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)