[PATCH iproute2 master] bpf: unbreak libelf linkage for bpf obj loader

Commit 69fed534a533 ("change how Config is used in Makefile's") moved
HAVE_MNL specific CFLAGS/LDLIBS for building with libmnl out of the
top level Makefile into sub-Makefiles. However, it also removed the
HAVE_ELF specific CFLAGS/LDLIBS entirely, which breaks the BPF object
loader for tc and ip with "No ELF library support compiled in." despite
having libelf detected in configure script. Fix it similarly as in
69fed534a533 for HAVE_ELF.

Fixes: 69fed534a533 ("change how Config is used in Makefile's")
Reported-by: Jeffrey Panneman <redacted>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
---
 ip/Makefile  | 4 ++++
 lib/Makefile | 4 ++++
 tc/Makefile  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/ip/Makefile b/ip/Makefile
index 572604d..a754c04 100644
--- a/ip/Makefile
+++ b/ip/Makefile

@@ -19,6 +19,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
 	CFLAGS += -DHAVE_SETNS
 endif
 
+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)

diff --git a/lib/Makefile b/lib/Makefile
index 637fe48..b7b1d56 100644
--- a/lib/Makefile
+++ b/lib/Makefile

@@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y)
 	CFLAGS += -DHAVE_SETNS
 endif
 
+ifeq ($(HAVE_ELF),y)
+	CFLAGS += -DHAVE_ELF
+endif
+
 ifeq ($(HAVE_MNL),y)
 	CFLAGS += -DHAVE_LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
 endif

diff --git a/tc/Makefile b/tc/Makefile
index c364a05..a9b4b8e 100644
--- a/tc/Makefile
+++ b/tc/Makefile

@@ -102,6 +102,10 @@ endif
 TCOBJ += $(TCMODULES)
 LDLIBS += -L. -lm
 
+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)

-- 
1.9.3

On Thu, 10 Aug 2017 00:15:41 +0200
Daniel Borkmann [off-list ref] wrote:

Commit 69fed534a533 ("change how Config is used in Makefile's") moved
HAVE_MNL specific CFLAGS/LDLIBS for building with libmnl out of the
top level Makefile into sub-Makefiles. However, it also removed the
HAVE_ELF specific CFLAGS/LDLIBS entirely, which breaks the BPF object
loader for tc and ip with "No ELF library support compiled in." despite
having libelf detected in configure script. Fix it similarly as in
69fed534a533 for HAVE_ELF.

Fixes: 69fed534a533 ("change how Config is used in Makefile's")
Reported-by: Jeffrey Panneman <redacted>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Thanks, but I am thinking maybe a better solution long term would be to
move all the package specific stuff into the generated Config file.

That way only the generation shell script would have to change.

Also, all the flags should probably be using pkg-config to get the values.

On 08/10/2017 02:35 AM, Stephen Hemminger wrote:

On Thu, 10 Aug 2017 00:15:41 +0200
Daniel Borkmann [off-list ref] wrote:

quoted

Commit 69fed534a533 ("change how Config is used in Makefile's") moved
HAVE_MNL specific CFLAGS/LDLIBS for building with libmnl out of the
top level Makefile into sub-Makefiles. However, it also removed the
HAVE_ELF specific CFLAGS/LDLIBS entirely, which breaks the BPF object
loader for tc and ip with "No ELF library support compiled in." despite
having libelf detected in configure script. Fix it similarly as in
69fed534a533 for HAVE_ELF.

Fixes: 69fed534a533 ("change how Config is used in Makefile's")
Reported-by: Jeffrey Panneman <redacted>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

Thanks, but I am thinking maybe a better solution long term would be to
move all the package specific stuff into the generated Config file.

That way only the generation shell script would have to change.

Also, all the flags should probably be using pkg-config to get the values.

Sure, sounds all good, for the time being, I would like to have
that breakage undone though, so users can work with loading BPF
programs again on -master.

Thanks,
Daniel

On Thu, 10 Aug 2017 10:44:13 +0200
Daniel Borkmann [off-list ref] wrote:

On 08/10/2017 02:35 AM, Stephen Hemminger wrote:

quoted

On Thu, 10 Aug 2017 00:15:41 +0200
Daniel Borkmann [off-list ref] wrote:
 

quoted

Commit 69fed534a533 ("change how Config is used in Makefile's") moved
HAVE_MNL specific CFLAGS/LDLIBS for building with libmnl out of the
top level Makefile into sub-Makefiles. However, it also removed the
HAVE_ELF specific CFLAGS/LDLIBS entirely, which breaks the BPF object
loader for tc and ip with "No ELF library support compiled in." despite
having libelf detected in configure script. Fix it similarly as in
69fed534a533 for HAVE_ELF.

Fixes: 69fed534a533 ("change how Config is used in Makefile's")
Reported-by: Jeffrey Panneman <redacted>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>  

Thanks, but I am thinking maybe a better solution long term would be to
move all the package specific stuff into the generated Config file.

That way only the generation shell script would have to change.

Also, all the flags should probably be using pkg-config to get the values.  

Sure, sounds all good, for the time being, I would like to have
that breakage undone though, so users can work with loading BPF
programs again on -master.

Thanks,
Daniel

Agree. I will merge this for master, and work on better config management
in net-next.

On 08/11/2017 01:41 AM, Stephen Hemminger wrote:

On Thu, 10 Aug 2017 10:44:13 +0200
Daniel Borkmann [off-list ref] wrote:

[...]

Agree. I will merge this for master, and work on better config management
in net-next.

Sounds good, thanks.