From 5062fbe7ec16c4f736bca9aab68dde101d6d6163 Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Tue, 7 Jun 2016 17:22:35 -0400 Subject: cgit.mk: Use $PKG_CONFIG PKG_CONFIG is a variable dictated by autoconf standards; it should be used if set. --- cgit.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cgit.mk') diff --git a/cgit.mk b/cgit.mk index 1b50307..369f309 100644 --- 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)"' +PKG_CONFIG ?= pkg-config + 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 \ - pkg-config --exists $$pc 2>/dev/null && echo $$pc && break; \ + $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \ done) LUA_MODE := autodetected else @@ -39,8 +41,8 @@ else 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 v1.2.3 From 40fbefba0514b33988d453aea05aa2b956e98f84 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Fri, 1 Jul 2016 22:00:37 -0400 Subject: Link with -ldl on GNU/kFreeBSD GNU/kFreeBSD uses the FreeBSD kernel with the GNU C library. Signed-off-by: Peter Colberg --- cgit.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cgit.mk') diff --git a/cgit.mk b/cgit.mk index 369f309..8d4f5e0 100644 --- a/cgit.mk +++ b/cgit.mk @@ -53,8 +53,8 @@ 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/kFreeBSD)) CGIT_LIBS += -ldl endif -- cgit v1.2.3