git: update to v2.22.0

[cgit.git] / cgit.mk

diff --git a/cgit.mk b/cgit.mk
index 2e2992f3633d6914d3b7f38ce18eeeb70d3ac320..3fcc1ca3144038859b57a88446e7af9b2abf9260 100644 (file)
--- a/cgit.mk
+++ b/cgit.mk
@@ -21,6 +21,8 @@ CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 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
 ifdef NO_C99_FORMAT
        CFLAGS += -DNO_C99_FORMAT
 endif


@@ -31,7 +33,7 @@ ifdef NO_LUA
 else
 ifeq ($(LUA_PKGCONFIG),)
        LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
 else
 ifeq ($(LUA_PKGCONFIG),)
        LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \

-                       pkg-config --exists $$pc && echo $$pc && break; \
+                       $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \

                        done)
        LUA_MODE := autodetected
 else
                        done)
        LUA_MODE := autodetected
 else


@@ -39,8 +41,8 @@ else
 endif
 ifneq ($(LUA_PKGCONFIG),)
        LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
 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)
+       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
        CGIT_LIBS += $(LUA_LIBS)
        CGIT_CFLAGS += $(LUA_CFLAGS)
 else


@@ -51,8 +53,8 @@ endif
 
 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
 
        CGIT_LIBS += -ldl
 endif
 


@@ -75,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 += 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
 CGIT_OBJ_NAMES += ui-blob.o
 CGIT_OBJ_NAMES += ui-clone.o
 CGIT_OBJ_NAMES += ui-commit.o


@@ -96,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.
 
 # 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)"'
 $(CGIT_VERSION_OBJS): $(CGIT_PREFIX)VERSION
 $(CGIT_VERSION_OBJS): EXTRA_CPPFLAGS = \
        -DCGIT_VERSION='"$(CGIT_VERSION)"'


@@ -129,3 +132,10 @@ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
 $(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_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)