* [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli
@ 2013-11-02 10:26 Thomas Petazzoni
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 10:26 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
package/libnl/libnl.mk | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
index 5c884d7..3b56bc8 100644
--- a/package/libnl/libnl.mk
+++ b/package/libnl/libnl.mk
@@ -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))
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs
2013-11-02 10:26 [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Thomas Petazzoni
@ 2013-11-02 10:26 ` Thomas Petazzoni
2013-11-02 17:57 ` Yann E. MORIN
` (2 more replies)
2013-11-02 17:56 ` [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Yann E. MORIN
` (2 subsequent siblings)
3 siblings, 3 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 10:26 UTC (permalink / raw)
To: buildroot
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 <thomas.petazzoni@free-electrons.com>
---
package/libnl/Config.in | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/package/libnl/Config.in b/package/libnl/Config.in
index fec10d3..be41b07 100644
--- a/package/libnl/Config.in
+++ b/package/libnl/Config.in
@@ -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
--
1.8.1.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli
2013-11-02 10:26 [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Thomas Petazzoni
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
@ 2013-11-02 17:56 ` Yann E. MORIN
2013-11-02 18:00 ` Samuel Martin
2013-11-02 18:37 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2013-11-02 17:56 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-02 11:26 +0100, Thomas Petazzoni spake thusly:
> 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 <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/libnl/libnl.mk | 19 ++++---------------
> 1 file changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/package/libnl/libnl.mk b/package/libnl/libnl.mk
> index 5c884d7..3b56bc8 100644
> --- a/package/libnl/libnl.mk
> +++ b/package/libnl/libnl.mk
> @@ -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))
> --
> 1.8.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
@ 2013-11-02 17:57 ` Yann E. MORIN
2013-11-02 18:01 ` Samuel Martin
2013-11-04 21:06 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Yann E. MORIN @ 2013-11-02 17:57 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2013-11-02 11:26 +0100, Thomas Petazzoni spake thusly:
> 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 <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/libnl/Config.in | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/package/libnl/Config.in b/package/libnl/Config.in
> index fec10d3..be41b07 100644
> --- a/package/libnl/Config.in
> +++ b/package/libnl/Config.in
> @@ -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
> --
> 1.8.1.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli
2013-11-02 10:26 [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Thomas Petazzoni
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
2013-11-02 17:56 ` [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Yann E. MORIN
@ 2013-11-02 18:00 ` Samuel Martin
2013-11-02 18:37 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Samuel Martin @ 2013-11-02 18:00 UTC (permalink / raw)
To: buildroot
2013/11/2 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 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 <thomas.petazzoni@free-electrons.com>
>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/e83f12da/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
2013-11-02 17:57 ` Yann E. MORIN
@ 2013-11-02 18:01 ` Samuel Martin
2013-11-04 21:06 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Samuel Martin @ 2013-11-02 18:01 UTC (permalink / raw)
To: buildroot
2013/11/2 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 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 <thomas.petazzoni@free-electrons.com>
>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Regards,
--
Samuel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20131102/fb0be977/attachment.html>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli
2013-11-02 10:26 [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Thomas Petazzoni
` (2 preceding siblings ...)
2013-11-02 18:00 ` Samuel Martin
@ 2013-11-02 18:37 ` Thomas Petazzoni
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Petazzoni @ 2013-11-02 18:37 UTC (permalink / raw)
To: buildroot
Dear Thomas Petazzoni,
On Sat, 2 Nov 2013 11:26:25 +0100, Thomas Petazzoni wrote:
> 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 <thomas.petazzoni@free-electrons.com>
> ---
> package/libnl/libnl.mk | 19 ++++---------------
> 1 file changed, 4 insertions(+), 15 deletions(-)
Committed both patches to for-peter-2013.11, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
2013-11-02 17:57 ` Yann E. MORIN
2013-11-02 18:01 ` Samuel Martin
@ 2013-11-04 21:06 ` Peter Korsgaard
2 siblings, 0 replies; 8+ messages in thread
From: Peter Korsgaard @ 2013-11-04 21:06 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 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.log
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> package/libnl/Config.in | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
> diff --git a/package/libnl/Config.in b/package/libnl/Config.in
> index fec10d3..be41b07 100644
> --- a/package/libnl/Config.in
> +++ b/package/libnl/Config.in
> @@ -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"
This comment should depend on BR2_PREFER_STATIC_LIB.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-11-04 21:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-02 10:26 [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Thomas Petazzoni
2013-11-02 10:26 ` [Buildroot] [PATCH 2/2] libnl: do not allow to build tools on static lib configs Thomas Petazzoni
2013-11-02 17:57 ` Yann E. MORIN
2013-11-02 18:01 ` Samuel Martin
2013-11-04 21:06 ` Peter Korsgaard
2013-11-02 17:56 ` [Buildroot] [PATCH 1/2] libnl: simplify makefile by using --{enable, disable}-cli Yann E. MORIN
2013-11-02 18:00 ` Samuel Martin
2013-11-02 18:37 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox