added my Recipes
This commit is contained in:
@@ -0,0 +1,44 @@
|
||||
From 223de708552b1ab00ac1a119e82e13deed573036 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sat, 30 Oct 2021 10:22:38 -0700
|
||||
Subject: [PATCH] make: Make CC weak assignment
|
||||
|
||||
This ensures that if environment overrrides it then its respected, this
|
||||
helps cross-compiling cases
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,14 +18,14 @@ VERSION-FILE: FORCE
|
||||
@$(SHELL_PATH) ./GEN-VERSION-FILE
|
||||
-include VERSION-FILE
|
||||
|
||||
-CFLAGS = -g -O2 -Wall -W -Werror=format-security
|
||||
-LDFLAGS =
|
||||
+CFLAGS += -g -O2 -Wall -W -Werror=format-security
|
||||
+LDFLAGS ?=
|
||||
IPTRAF_CFLAGS := -std=gnu99 -D_GNU_SOURCE
|
||||
ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(IPTRAF_CFLAGS)
|
||||
ALL_LDFLAGS = $(LDFLAGS)
|
||||
STRIP ?= strip
|
||||
|
||||
-prefix = $(HOME)
|
||||
+prefix ?= $(HOME)
|
||||
sbindir_relative = sbin
|
||||
sbindir = $(prefix)/$(sbindir_relative)
|
||||
mandir = $(prefix)/share/man
|
||||
@@ -39,7 +39,7 @@ pathsep = :
|
||||
|
||||
export prefix bindir sharedir sysconfdir gitwebdir localedir
|
||||
|
||||
-CC = cc
|
||||
+CC ?= cc
|
||||
RM = rm -f
|
||||
INSTALL = install
|
||||
RPMBUILD = rpmbuild
|
||||
@@ -0,0 +1,3 @@
|
||||
d /run/iptraf-ng 0755 root root -
|
||||
d /var/log/iptraf-ng 0755 root root -
|
||||
d /var/lib/iptraf-ng 0755 root root -
|
||||
@@ -0,0 +1,90 @@
|
||||
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
|
||||
Reference in New Issue
Block a user