git: update to v2.31.0

[cgit.git] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index deef9a723c479819581f540fb235203c97b21ec3..3fcc1ca3144038859b57a88446e7af9b2abf9260 100644 (file)
--- a/cgit.mk
+++ b/cgit.mk
@@ -21,55 +21,51 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
+PKG_CONFIG ?= pkg-config
+
 ifdef NO_C99_FORMAT
        CFLAGS += -DNO_C99_FORMAT
 endif
 
-nullstring :=
-fourspace := $(nullstring)    
 ifdef NO_LUA
-       $(info $(fourspace)* building without specified Lua support)
+       LUA_MESSAGE := linking without specified Lua support
        CGIT_CFLAGS += -DNO_LUA
 else
-LUAJIT_CFLAGS := $(shell pkg-config --cflags luajit 2>/dev/null)
-LUAJIT_LIBS := $(shell pkg-config --libs luajit 2>/dev/null)
-LUA_LIBS := $(shell pkg-config --libs lua 2>/dev/null)
-LUA_CFLAGS := $(shell pkg-config --cflags lua 2>/dev/null)
-ifeq (JIT,$(LUA_IMPLEMENTATION))
-       ifeq ($(strip $(LUAJIT_LIBS)),)
-               $(error LuaJIT specified via LUA_IMPLEMENTATION=JIT, but library could not be found.)
-       endif
-       $(info $(fourspace)* building with selected LuaJIT)
-       CGIT_LIBS += $(LUAJIT_LIBS)
-       CGIT_CFLAGS += $(LUAJIT_CFLAGS)
-else ifeq (VANILLA,$(LUA_IMPLEMENTATION))
-       ifeq ($(strip $(LUA_LIBS)),)
-               $(error Lua specified via LUA_IMPLEMENTATION=VANILLA, but library could not be found.)
-       endif
-       $(info $(fourspace)* building with selected Lua)
-       CGIT_LIBS += $(LUA_LIBS)
-       CGIT_LIBS += $(LUA_CFLAGS)
-else ifneq ($(strip $(LUAJIT_LIBS)),)
-       $(info $(fourspace)* building with autodetected LuaJIT)
-       CGIT_LIBS += $(LUAJIT_LIBS)
-       CGIT_CFLAGS += $(LUAJIT_CFLAGS)
-else ifneq ($(strip $(LUA_LIBS)),)
-       $(info $(fourspace)* building with autodetected Lua)
+ifeq ($(LUA_PKGCONFIG),)
+       LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
+                       $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
+                       done)
+       LUA_MODE := autodetected
+else
+       LUA_MODE := specified
+endif
+ifneq ($(LUA_PKGCONFIG),)
+       LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
+       LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null)
+       LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
        CGIT_LIBS += $(LUA_LIBS)
        CGIT_CFLAGS += $(LUA_CFLAGS)
 else
-       $(info $(fourspace)* building without autodetected Lua support)
+       LUA_MESSAGE := linking without autodetected Lua support
        NO_LUA := YesPlease
        CGIT_CFLAGS += -DNO_LUA
 endif
 
 endif
 
-# Add -ldl to linker flags on non-BSD systems.
-ifeq ($(findstring BSD,$(uname_S)),)
+# Add -ldl to linker flags on systems that commonly use GNU libc.
+ifneq (,$(filter $(uname_S),Linux GNU GNU/kFreeBSD))
        CGIT_LIBS += -ldl
 endif
 
+# glibc 2.1+ offers sendfile which the most common C library on Linux
+ifeq ($(uname_S),Linux)
+       HAVE_LINUX_SENDFILE = YesPlease
+endif
+
+ifdef HAVE_LINUX_SENDFILE
+       CGIT_CFLAGS += -DHAVE_LINUX_SENDFILE
+endif
 
 CGIT_OBJ_NAMES += cgit.o
 CGIT_OBJ_NAMES += cache.o
@@ -81,6 +77,7 @@ CGIT_OBJ_NAMES += parsing.o
 CGIT_OBJ_NAMES += scan-tree.o
 CGIT_OBJ_NAMES += shared.o
 CGIT_OBJ_NAMES += ui-atom.o
+CGIT_OBJ_NAMES += ui-blame.o
 CGIT_OBJ_NAMES += ui-blob.o
 CGIT_OBJ_NAMES += ui-clone.o
 CGIT_OBJ_NAMES += ui-commit.o
@@ -102,7 +99,7 @@ CGIT_OBJS := $(addprefix $(CGIT_PREFIX),$(CGIT_OBJ_NAMES))
 
 # Only cgit.c reference CGIT_VERSION so we only rebuild its objects when the
 # version changes.
-CGIT_VERSION_OBJS := $(addprefix $(CGIT_PREFIX),cgit.o)
+CGIT_VERSION_OBJS := $(addprefix $(CGIT_PREFIX),cgit.o cgit.sp)
 $(CGIT_VERSION_OBJS): $(CGIT_PREFIX)VERSION
 $(CGIT_VERSION_OBJS): EXTRA_CPPFLAGS = \
        -DCGIT_VERSION='"$(CGIT_VERSION)"'
@@ -133,4 +130,12 @@ $(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)
+       @echo 1>&1 "    * $(LUA_MESSAGE)"
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)
+
+CGIT_SP_OBJS := $(patsubst %.o,%.sp,$(CGIT_OBJS))
+
+$(CGIT_SP_OBJS): %.sp: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS FORCE
+       $(QUIET_SP)cgcc -no-compile $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $(SPARSE_FLAGS) $<
+
+cgit-sparse: $(CGIT_SP_OBJS)