summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-10-30 10:48:10 -0700
committerKhem Raj <raj.khem@gmail.com>2021-11-01 05:45:17 -0700
commitdfe7eef9ca7ac3452804ce72148679235855b9b4 (patch)
tree2c270be3a41928b5af0ce4a64f56cfd7597ccf10 /meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
parentce3c3f2099d4c9df3ee98fe11931f0c4a38eb4ed (diff)
downloadmeta-openembedded-dfe7eef9ca7ac3452804ce72148679235855b9b4.tar.gz
iptraf-ng: Upgrade to 1.2.1
Add patch to fix cross build Fix runtime with systemd Release notes https://github.com/iptraf-ng/iptraf-ng/releases/tag/v1.2.0 https://github.com/iptraf-ng/iptraf-ng/releases/tag/v1.2.1 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch')
-rw-r--r--meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch55
1 files changed, 32 insertions, 23 deletions
diff --git a/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch b/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
index 65b92dade2..8704310406 100644
--- a/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
+++ b/meta-oe/recipes-devtools/iptraf/iptraf-ng/ncurses-config.patch
@@ -2,11 +2,9 @@ Use pkg-config to search for ncurses libraries
2 2
3Signed-off-by: Khem Raj <raj.khem@gmail.com> 3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending 4Upstream-Status: Pending
5Index: iptraf-ng-1.1.4/Makefile 5--- a/Makefile
6=================================================================== 6+++ b/Makefile
7--- iptraf-ng-1.1.4.orig/Makefile 7@@ -201,8 +201,8 @@ endif
8+++ iptraf-ng-1.1.4/Makefile
9@@ -205,8 +205,8 @@ endif
10 8
11 ifndef NCURSES_LDFLAGS 9 ifndef NCURSES_LDFLAGS
12 ifdef NEEDS_NCURSES5 10 ifdef NEEDS_NCURSES5
@@ -17,7 +15,7 @@ Index: iptraf-ng-1.1.4/Makefile
17 ifndef NO_PANEL 15 ifndef NO_PANEL
18 NCURSES_LDFLAGS += -lpanel 16 NCURSES_LDFLAGS += -lpanel
19 endif 17 endif
20@@ -215,8 +215,8 @@ endif 18@@ -211,8 +211,8 @@ endif
21 19
22 ifndef NCURSES_LDFLAGS 20 ifndef NCURSES_LDFLAGS
23 ifdef NEEDS_NCURSESW5 21 ifdef NEEDS_NCURSESW5
@@ -26,9 +24,9 @@ Index: iptraf-ng-1.1.4/Makefile
26+ NCURSES_CFLAGS := $(shell p[k-config ncursesw --cflags 2>/dev/null) 24+ NCURSES_CFLAGS := $(shell p[k-config ncursesw --cflags 2>/dev/null)
27+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) 25+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
28 ifndef NO_PANEL 26 ifndef NO_PANEL
29 NCURSES_LDFLAGS += -lpanel 27 NCURSES_LDFLAGS += -lpanelw
30 endif 28 endif
31@@ -225,8 +225,8 @@ endif 29@@ -221,8 +221,8 @@ endif
32 30
33 ifndef NCURSES_LDFLAGS 31 ifndef NCURSES_LDFLAGS
34 ifdef NEEDS_NCURSES6 32 ifdef NEEDS_NCURSES6
@@ -39,7 +37,7 @@ Index: iptraf-ng-1.1.4/Makefile
39 ifndef NO_PANEL 37 ifndef NO_PANEL
40 NCURSES_LDFLAGS += -lpanel 38 NCURSES_LDFLAGS += -lpanel
41 endif 39 endif
42@@ -235,8 +235,8 @@ endif 40@@ -231,8 +231,8 @@ endif
43 41
44 ifndef NCURSES_LDFLAGS 42 ifndef NCURSES_LDFLAGS
45 ifdef NEEDS_NCURSESW6 43 ifdef NEEDS_NCURSESW6
@@ -48,34 +46,45 @@ Index: iptraf-ng-1.1.4/Makefile
48+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) 46+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
49+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) 47+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
50 ifndef NO_PANEL 48 ifndef NO_PANEL
51 NCURSES_LDFLAGS += -lpanel 49 NCURSES_LDFLAGS += -lpanelw
52 endif 50 endif
53@@ -246,17 +246,17 @@ endif 51@@ -241,27 +241,27 @@ endif
52
54 # try find ncuses by autodetect 53 # try find ncuses by autodetect
55 ifndef NCURSES_LDFLAGS 54 ifndef NCURSES_LDFLAGS
56 ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) 55- ifneq ($(shell ncursesw6-config --libs 2>/dev/null),)
57- NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) 56- NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null)
58- NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) 57- NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null)
58+ ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
59+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
60+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
61 ifndef NO_PANEL
62 NCURSES_LDFLAGS += -lpanelw
63 endif
59- else ifneq ($(shell ncurses6-config --libs 2>/dev/null),) 64- else ifneq ($(shell ncurses6-config --libs 2>/dev/null),)
60- NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) 65- NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null)
61- NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) 66- NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null)
67+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
68+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
69+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
70 ifndef NO_PANEL
71 NCURSES_LDFLAGS += -lpanel
72 endif
62- else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) 73- else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),)
63- NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) 74- NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null)
64- NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) 75- NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null)
76+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
77+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
78+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
79 ifndef NO_PANEL
80 NCURSES_LDFLAGS += -lpanelw
81 endif
65- else ifneq ($(shell ncurses5-config --libs 2>/dev/null),) 82- else ifneq ($(shell ncurses5-config --libs 2>/dev/null),)
66- NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) 83- NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null)
67- NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) 84- NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null)
68+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
69+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
70+ else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),)
71+ NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null)
72+ NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null)
73+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),) 85+ else ifneq ($(shell pkg-config ncursesw --libs 2>/dev/null),)
74+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null) 86+ NCURSES_CFLAGS := $(shell pkg-config ncursesw --cflags 2>/dev/null)
75+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null) 87+ NCURSES_LDFLAGS := $(shell pkg-config ncursesw --libs 2>/dev/null)
76+ else ifneq ($(shell pkg-config ncurses --libs 2>/dev/null),) 88 ifndef NO_PANEL
77+ NCURSES_CFLAGS := $(shell pkg-config ncurses --cflags 2>/dev/null) 89 NCURSES_LDFLAGS += -lpanel
78+ NCURSES_LDFLAGS := $(shell pkg-config ncurses --libs 2>/dev/null) 90 endif
79 endif
80
81 ifneq ($(NCURSES_LDFLAGS),)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-04-21 18:14:51 +0000