Skip to contentSkip to conversation

Fix batctl for static builds

PATCH New Jens Zettelmeyer 2 participants 3 messages Mar 6, 2015 – Mar 7, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix batctl for static builds

---
 package/batctl/batctl.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/batctl/batctl.mk +5 -1
index c458752..d99239f 100644
@@ -9,8 +9,12 @@ BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL
 BATCTL_LICENSE = GPLv2
 BATCTL_DEPENDENCIES = libnl host-pkgconf
 
+ifeq ($(BR2_STATIC_LIBS),y)
+BATCTL_LIBS += -lnl-3 -lm -lpthread
+endif
+
 define BATCTL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) LDLIBS="$(TARGET_LIBS) $(BATCTL_LIBS)" $(MAKE) -C $(@D) all
 endef
 
 define BATCTL_INSTALL_TARGET_CMDS
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 Fix batctl for static builds

Dear Jens Zettelmeyer,

Quoted 4 lines · Jens Zettelmeyer
---
 package/batctl/batctl.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Thanks for working on this. However, this isn't the right fix for the
problem: batctl uses pkg-config to discover how to link with libnl. It's just that the libnl .pc files were not correct in terms of static linking handling. Fixing those .pc files is a better solution, as it 1/ can be upstreamed to libnl, 2/ avoids hacks in batctl.mk, and 3/ allows to also removes hacks in other Buildroot packages.

See the series I have sent at
http://lists.busybox.net/pipermail/buildroot/2015-March/121180.html.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 Fix batctl for static builds

Dear Thomas Petazzoni,

Thank you. I had a look at the libnl pkg-config patch. That makes a lot more sense than what i did.

Thank you
Jens

2015-03-07 12:01 GMT+00:00 Thomas Petazzoni <
[email protected]>:

Quoted 18 lines

Dear Jens Zettelmeyer,

Quoted 4 lines · Jens Zettelmeyer
---
 package/batctl/batctl.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Thanks for working on this. However, this isn't the right fix for the
problem: batctl uses pkg-config to discover how to link with libnl. It's just that the libnl .pc files were not correct in terms of static linking handling. Fixing those .pc files is a better solution, as it 1/ can be upstreamed to libnl, 2/ avoids hacks in batctl.mk, and 3/ allows to also removes hacks in other Buildroot packages.

See the series I have sent at
http://lists.busybox.net/pipermail/buildroot/2015-March/121180.html.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20150307/9626da09/attachment.html>