forked from pool/iptraf-ng
Marcus Meissner
9f4dbf2544
initiate SRPM rename to iptraf-ng OBS-URL: https://build.opensuse.org/request/show/758341 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iptraf-ng?expand=0&rev=1
76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
From: Vitezslav Samel <vitezslav@samel.cz>
|
|
Date: Thu, 17 Apr 2014 14:24:25 +0200
|
|
Subject: build: use wide version of -lpanel when needed
|
|
Patch-mainline: yes
|
|
Git-commit: 1a009a230aacaa87d24fe75a257ffe8d57313116
|
|
References: bnc#940207
|
|
|
|
When linking with -lncurses[56]w we need to link with -lpanelw.
|
|
|
|
Signed-off-by: Vitezslav Samel <vitezslav@samel.cz>
|
|
Signed-off-by: Nikola Pajkovsky <n.pajkovsky@gmail.com>
|
|
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
|
---
|
|
Makefile | 22 ++++++++++++++--------
|
|
1 file changed, 14 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 958b0fbeec0f..59b7c6f90298 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -218,7 +218,7 @@ ifdef NEEDS_NCURSESW5
|
|
NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
|
|
NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
- NCURSES_LDFLAGS += -lpanel
|
|
+ NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -238,7 +238,7 @@ ifdef NEEDS_NCURSESW6
|
|
NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
|
|
NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
|
|
ifndef NO_PANEL
|
|
- NCURSES_LDFLAGS += -lpanel
|
|
+ NCURSES_LDFLAGS += -lpanelw
|
|
endif
|
|
endif
|
|
endif
|
|
@@ -248,21 +248,27 @@ 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)
|
|
+ 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)
|
|
+ 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)
|
|
+ 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)
|
|
- endif
|
|
-
|
|
- ifneq ($(NCURSES_LDFLAGS),)
|
|
- ifndef NO_PANEL
|
|
- NCURSES_LDFLAGS += -lpanel
|
|
- endif
|
|
+ ifndef NO_PANEL
|
|
+ NCURSES_LDFLAGS += -lpanel
|
|
+ endif
|
|
endif
|
|
endif
|
|
|
|
--
|
|
2.5.0
|
|
|