forked from hasufell/hasufell-repository
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From fd26eed89bbe3f980b76df379eb0d44c02e48918 Mon Sep 17 00:00:00 2001
|
|
From: Julian Ospald <hasufell@posteo.de>
|
|
Date: Fri, 19 Feb 2016 16:02:11 +0100
|
|
Subject: [PATCH] MAKE: use PKGCONFIG to get ncurses flags, if available
|
|
|
|
This fixes build failures on some distributions:
|
|
https://bugs.gentoo.org/show_bug.cgi?id=527034
|
|
---
|
|
crawl-ref/source/Makefile | 22 ++++++++++++++++------
|
|
1 file changed, 16 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
|
|
index e9c54db..88ad7f8 100644
|
|
--- a/crawl-ref/source/Makefile
|
|
+++ b/crawl-ref/source/Makefile
|
|
@@ -1013,17 +1013,27 @@ endif
|
|
# Your ncurses library may include Unicode support, and you may not have a
|
|
# separate libncursesw; this is the case on Mac OS/Darwin.
|
|
ifdef LIBNCURSES_IS_UNICODE
|
|
-NC_LIB = ncurses
|
|
-NC_INCLUDE = $(NC_PREFIX)/include/ncurses
|
|
+ ifndef NO_PKGCONFIG
|
|
+ NC_LIBS = $(shell $(PKGCONFIG) --libs ncurses 2>/dev/null || echo "-L$(NC_PREFIX)/lib -lncurses")
|
|
+ NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncurses 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncurses")
|
|
+ else
|
|
+ NC_LIBS = -L$(NC_PREFIX)/lib -lncurses
|
|
+ NC_CFLAGS = -isystem $(NC_PREFIX)/include/ncurses
|
|
+ endif
|
|
else
|
|
-NC_LIB = ncursesw
|
|
-NC_INCLUDE = $(NC_PREFIX)/include/ncursesw
|
|
+ ifndef NO_PKGCONFIG
|
|
+ NC_LIBS = $(shell $(PKGCONFIG) --libs ncursesw || echo "-L$(NC_PREFIX)/lib -lncursesw")
|
|
+ NC_CFLAGS = $(shell $(PKGCONFIG) --cflags ncursesw 2>/dev/null || echo "-isystem $(NC_PREFIX)/include/ncursesw")
|
|
+ else
|
|
+ NC_LIBS = -L$(NC_PREFIX)/lib -lncursesw
|
|
+ NC_CFLAGS = -isystem $(NC_PREFIX)/include/ncursesw
|
|
+ endif
|
|
endif
|
|
|
|
-INCLUDES_L += -isystem $(NC_INCLUDE)
|
|
+CFOTHERS_L += $(NC_CFLAGS)
|
|
|
|
ifndef TILES
|
|
-LIBS += -L$(NC_PREFIX)/lib -l$(NC_LIB)
|
|
+LIBS += $(NC_LIBS)
|
|
endif
|
|
|
|
endif
|