francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
91 lines
3.6 KiB
Diff
91 lines
3.6 KiB
Diff
Use pkg-config to search for ncurses libraries
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Upstream-Status: Pending
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -201,8 +201,8 @@ endif
|
|
|
|
ifndef NCURSES_LDFLAGS
|
|
ifdef NEEDS_NCURSES5
|
|
- NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanel
|
|
endif
|
|
@@ -211,8 +211,8 @@ endif
|
|
|
|
ifndef NCURSES_LDFLAGS
|
|
ifdef NEEDS_NCURSESW5
|
|
- NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
|
|
+ NCURSES_CFLAGS := $(shell p[k-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
@@ -221,8 +221,8 @@ endif
|
|
|
|
ifndef NCURSES_LDFLAGS
|
|
ifdef NEEDS_NCURSES6
|
|
- NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncurses6 --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncurses6 --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanel
|
|
endif
|
|
@@ -231,8 +231,8 @@ endif
|
|
|
|
ifndef NCURSES_LDFLAGS
|
|
ifdef NEEDS_NCURSESW6
|
|
- NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
@@ -241,27 +241,27 @@ endif
|
|
|
|
# try find ncuses by autodetect
|
|
ifndef NCURSES_LDFLAGS
|
|
- ifneq ($(shell ncursesw6-config --libs 2>/dev/null),)
|
|
- NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
|
|
+ ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
- else ifneq ($(shell ncurses6-config --libs 2>/dev/null),)
|
|
- NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null)
|
|
+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanel
|
|
endif
|
|
- else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),)
|
|
- NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
|
|
+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
- else ifneq ($(shell ncurses5-config --libs 2>/dev/null),)
|
|
- NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
|
|
- NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
|
|
+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
|
|
+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
|
|
+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
NCURSES_LDFLAGS += -lpanel
|
|
endif
|