File change-how-Config-is-used-in-Makefile-s.patch of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File change-how-Config-is-used-in-Makefile-s.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Currently displaying revision 10b09744f30dc355771f1440b56f80da , Show latest

From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 9 Aug 2017 08:45:04 -0700
Subject: change how Config is used in Makefile's
Patch-mainline: v4.13.0
Git-commit: 69fed534a533f48b8772d935590f82206171ca96
References: bsc#1085669

The recent LIBMNL changes was made more difficult to debug because
of how Config is handle in clean make. The Config file is generated
by top level make, but since it is not recursive, the values generated
would not be visible on a clean make.

The change is to not include Config in top level make, and move
all the conditionals down into sub makefiles. Not ideal, but beter
than going full autoconf route. Or forcing separate configure
step.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Michal Kubecek <mkubecek@suse.cz>

diff --git a/Makefile b/Makefile
index 6c57f690a54b..3069ee91e159 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,4 @@
-# Include "Config" if already generated
-ifneq ($(wildcard Config),)
-include Config
-endif
+# Top level Makefile for iproute2
 
 ifeq ($(VERBOSE),0)
 MAKEFLAGS += --no-print-directory
@@ -57,16 +54,6 @@ SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma man
 LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
 LDLIBS += $(LIBNETLINK)
 
-ifeq ($(HAVE_ELF),y)
-	CFLAGS += -DHAVE_ELF
-	LDLIBS += -lelf
-endif
-
-ifeq ($(HAVE_MNL),y)
-	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
-	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
-endif
-
 all: Config
 	@set -e; \
 	for i in $(SUBDIRS); \
diff --git a/bridge/Makefile b/bridge/Makefile
index 634c370a3c01..fa448ea2e4fa 100644
--- a/bridge/Makefile
+++ b/bridge/Makefile
@@ -6,6 +6,11 @@ ifeq ($(IP_CONFIG_SETNS),y)
 	CFLAGS += -DHAVE_SETNS
 endif
 
+ifeq ($(HAVE_MNL),y)
+	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
+	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
+endif
+
 all: bridge
 
 bridge: $(BROBJ) $(LIBNETLINK)
diff --git a/genl/Makefile b/genl/Makefile
index f5a0bfe42aff..f0efe1ac6647 100644
--- a/genl/Makefile
+++ b/genl/Makefile
@@ -17,6 +17,11 @@ LDFLAGS += -Wl,-export-dynamic
 LDLIBS  += -lm -ldl
 endif
 
+ifeq ($(HAVE_MNL),y)
+	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
+	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
+endif
+
 all: genl
 
 genl: $(GENLOBJ) $(LIBNETLINK) $(LIBUTIL) $(GENLLIB)
diff --git a/misc/Makefile b/misc/Makefile
index 2b4cc22ef375..8c0b5ddfaa3d 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -19,6 +19,11 @@ ifeq ($(IP_CONFIG_SETNS),y)
 endif
 CFLAGS += -I$(DBM_INCLUDE)
 
+ifeq ($(HAVE_MNL),y)
+	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
+	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
+endif
+
 all: $(TARGETS)
 
 ss: $(SSOBJ)
diff --git a/netem/Makefile b/netem/Makefile
index efff5850d9c1..9e36fe91fa41 100644
--- a/netem/Makefile
+++ b/netem/Makefile
@@ -1,3 +1,5 @@
+include ../Config
+
 DISTGEN = maketable normal pareto paretonormal
 DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
 
@@ -7,6 +9,11 @@ LDLIBS += -lm
 
 LIBDIR = /usr/lib
 
+ifeq ($(HAVE_MNL),y)
+	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
+	LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
+endif
+
 all: $(DISTGEN) $(DISTDATA)
 
 $(DISTGEN):
-- 
2.16.2

Places

File change-how-Config-is-used-in-Makefile-s.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Places