libnl: simplify makefile by using --{enable, disable}-cli
PATCH 1/2 libnl: simplify makefile by using --{enable, disable}-cli
The libnl configure script has a --{enable,disable}-cli options that allows to enable or disable the compilation of the libnl tools. Use this option instead of compiling everything and then removing the installed programs.
Note that we also get rid of the uninstall command, which is planned to be globally removed in Buildroot.
--- package/libnl/libnl.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
package/libnl/libnl.mk +4 -15
@@ -10,22 +10,11 @@ LIBNL_LICENSE = LGPLv2.1+ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex -LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \ - cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \ - qdisc-list -define LIBNL_UNINSTALL_TARGET_CMDS - rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.* - rm -rf $(TARGET_DIR)/usr/lib/libnl -endef - -define LIBNL_REMOVE_TOOLS - rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES)) - rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list -endef - -ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y) -LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS +ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) +LIBNL_CONF_OPT += --enable-cli +else +LIBNL_CONF_OPT += --disable-cli endif $(eval $(autotools-package))
Signature · 1 line
1.8.1.2
PATCH 1/2 libnl: simplify makefile by using --{enable, disable}-cli
Dear Thomas Petazzoni,
Quoted 5 lines · Thomas Petazzoni
The libnl configure script has a --{enable,disable}-cli options that allows to enable or disable the compilation of the libnl tools. Use this option instead of compiling everything and then removing the installed programs.
Quoted 7 lines
Note that we also get rid of the uninstall command, which is planned to be globally removed in Buildroot.
Signed-off-by Thomas Petazzoni <[email protected]>--- package/libnl/libnl.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)
Committed both patches to for-peter-2013.11, thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 libnl: simplify makefile by using --{enable, disable}-cli
In reply to Thomas PetazzoniThomas, All,
On 2013-11-02 11:26 +0100, Thomas Petazzoni spake thusly:
Quoted 9 lines
The libnl configure script has a --{enable,disable}-cli options that allows to enable or disable the compilation of the libnl tools. Use this option instead of compiling everything and then removing the installed programs.
Note that we also get rid of the uninstall command, which is planned to be globally removed in Buildroot.
Signed-off-by Thomas Petazzoni <[email protected]>
Quoted 42 lines
--- package/libnl/libnl.mk | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)package/libnl/libnl.mk +4
-15@@ -10,22 +10,11 @@ LIBNL_LICENSE = LGPLv2.1+ LIBNL_LICENSE_FILES = COPYING LIBNL_INSTALL_STAGING = YES LIBNL_DEPENDENCIES = host-bison host-flex -LIBNL_BINARIES = class-add class-delete class-list classid-lookup cls-add \ - cls-delete cls-list link-list pktloc-lookup qdisc-add qdisc-delete \ - qdisc-list -define LIBNL_UNINSTALL_TARGET_CMDS - rm -r $(TARGET_DIR)/usr/lib/libnl.* $(TARGET_DIR)/usr/lib/libnl-*.* - rm -rf $(TARGET_DIR)/usr/lib/libnl -endef - -define LIBNL_REMOVE_TOOLS - rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/nl-, $(LIBNL_BINARIES)) - rm -rf $(TARGET_DIR)/usr/sbin/genl-ctrl-list -endef - -ifneq ($(BR2_PACKAGE_LIBNL_TOOLS),y) -LIBNL_POST_INSTALL_TARGET_HOOKS += LIBNL_REMOVE_TOOLS +ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) +LIBNL_CONF_OPT += --enable-cli +else +LIBNL_CONF_OPT += --disable-cli endif $(eval $(autotools-package))Signature · 6 lines
1.8.1.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/2 libnl: simplify makefile by using --{enable, disable}-cli
In reply to Thomas Petazzoni2013/11/2 Thomas Petazzoni <[email protected]>
Quoted 10 lines
The libnl configure script has a --{enable,disable}-cli options that allows to enable or disable the compilation of the libnl tools. Use this option instead of compiling everything and then removing the installed programs.
Note that we also get rid of the uninstall command, which is planned to be globally removed in Buildroot.
Signed-off-by Thomas Petazzoni <[email protected]>
Regards,
Signature · 4 lines
Samuel -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/e83f12da/attachment.html>
PATCH 2/2 libnl: do not allow to build tools on static lib configs
In reply to Thomas PetazzoniBuilding the libnl tools requires the <dlfcn.h> header, which is not compatible with static only builds. Therefore, this commit makes the libnl tools option depend on !BR2_PREFER_STATIC_LIB.
Fixes:
http://autobuild.buildroot.org/results/573/57340b9bd2db3a523836e02e01cba6f7c17c8ca7/build-end.log
--- package/libnl/Config.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
package/libnl/Config.in +10 -3
@@ -6,11 +6,18 @@ config BR2_PACKAGE_LIBNL http://people.suug.ch/~tgr/libnl/ +comment "libnl needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +if BR2_PACKAGE_LIBNL + config BR2_PACKAGE_LIBNL_TOOLS bool "install tools" - depends on BR2_PACKAGE_LIBNL + # uses <dlfcn.h> + depends on !BR2_PREFER_STATIC_LIB help Install binary tools. -comment "libnl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libnl tools need a toolchain w/ dynamic library" + +endif
Signature · 1 line
1.8.1.2
PATCH 2/2 libnl: do not allow to build tools on static lib configs
Thomas, All,
On 2013-11-02 11:26 +0100, Thomas Petazzoni spake thusly:
Quoted 9 lines
Building the libnl tools requires the <
dlfcn.h> header, which is not compatible with static only builds. Therefore, this commit makes the libnl tools option depend on !BR2_PREFER_STATIC_LIB.Fixes:
http://autobuild.buildroot.org/results/573/57340b9bd2db3a523836e02e01cba6f7c17c8ca7/build-end.logSigned-off-by Thomas Petazzoni <[email protected]>
Quoted 37 lines
--- package/libnl/Config.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)package/libnl/Config.in +10
-3@@ -6,11 +6,18 @@ config BR2_PACKAGE_LIBNL http://people.suug.ch/~tgr/libnl/ +comment "libnl needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +if BR2_PACKAGE_LIBNL + config BR2_PACKAGE_LIBNL_TOOLS bool "install tools" - depends on BR2_PACKAGE_LIBNL + # uses <dlfcn.h> + depends on !BR2_PREFER_STATIC_LIB help Install binary tools. -comment "libnl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libnl tools need a toolchain w/ dynamic library" + +endifSignature · 6 lines
1.8.1.2 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 libnl: do not allow to build tools on static lib configs
In reply to Thomas Petazzoni2013/11/2 Thomas Petazzoni <[email protected]>
Quoted 11 lines
Building the libnl tools requires the <
dlfcn.h> header, which is not compatible with static only builds. Therefore, this commit makes the libnl tools option depend on !BR2_PREFER_STATIC_LIB.Fixes:
http://autobuild.buildroot.org/results/573/57340b9bd2db3a523836e02e01cba6f7c17c8ca7/build-end.log
Signed-off-by Thomas Petazzoni <[email protected]>
Regards,
Signature · 4 lines
Samuel -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/fb0be977/attachment.html>
PATCH 2/2 libnl: do not allow to build tools on static lib configs
In reply to Thomas PetazzoniQuoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Building the libnl tools requires the <
dlfcn.h> header, which is not compatible with static only builds. Therefore, this commit makes the libnl tools option depend on !BR2_PREFER_STATIC_LIB.Fixes:
http://autobuild.buildroot.org/results/573/57340b9bd2db3a523836e02e01cba6f7c17c8ca7/build-end.logSigned-off-by Thomas Petazzoni <[email protected]>--- package/libnl/Config.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)package/libnl/Config.in +5
-0@@ -6,11 +6,18 @@ config BR2_PACKAGE_LIBNL http://people.suug.ch/~tgr/libnl/ +comment "libnl needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +if BR2_PACKAGE_LIBNL + config BR2_PACKAGE_LIBNL_TOOLS
package/libnl/Config.in config BR2_PACKAGE_LIBNL · line 21
Quoted 10 lines
package/libnl/Config.in +3
-3bool "install tools" - depends on BR2_PACKAGE_LIBNL + # uses <dlfcn.h> + depends on !BR2_PREFER_STATIC_LIB help Install binary tools. -comment "libnl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "libnl tools need a toolchain w/ dynamic library"
This comment should depend on BR2_PREFER_STATIC_LIB.
Signature · 1 line
Bye, Peter Korsgaard