All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl
@ 2021-05-23  9:43 Bernd Kuhls
  2021-05-23 12:14 ` Yann E. MORIN
  2021-06-08  7:09 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2021-05-23  9:43 UTC (permalink / raw)
  To: buildroot

udev:
https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L626

libxml2:
https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L1273

ncurses:
https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L340

numactl:
https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L419

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/hwloc/hwloc.mk | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk
index 77a25a1775..8a08ab89c8 100644
--- a/package/hwloc/hwloc.mk
+++ b/package/hwloc/hwloc.mk
@@ -27,6 +27,13 @@ HWLOC_CONF_OPTS = \
 	--disable-libxml2 \
 	--disable-doxygen
 
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+HWLOC_CONF_OPTS += --enable-libudev
+HWLOC_DEPENDENCIES += udev
+else
+HWLOC_CONF_OPTS += --disable-libudev
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y)
 HWLOC_CONF_OPTS += --enable-pci
 HWLOC_DEPENDENCIES += libpciaccess
@@ -34,4 +41,19 @@ else
 HWLOC_CONF_OPTS += --disable-pci
 endif
 
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+HWLOC_CONF_OPTS += --enable-libxml2
+HWLOC_DEPENDENCIES += libxml2
+else
+HWLOC_CONF_OPTS += --disable-libxml2
+endif
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+HWLOC_DEPENDENCIES += ncurses
+endif
+
+ifeq ($(BR2_PACKAGE_NUMACTL),y)
+HWLOC_DEPENDENCIES += numactl
+endif
+
 $(eval $(autotools-package))
-- 
2.29.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl
  2021-05-23  9:43 [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl Bernd Kuhls
@ 2021-05-23 12:14 ` Yann E. MORIN
  2021-06-08  7:09 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-05-23 12:14 UTC (permalink / raw)
  To: buildroot

Bernd, All,

On 2021-05-23 11:43 +0200, Bernd Kuhls spake thusly:
> udev:
> https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L626
> 
> libxml2:
> https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L1273
> 
> ncurses:
> https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L340
> 
> numactl:
> https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L419
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/hwloc/hwloc.mk | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/package/hwloc/hwloc.mk b/package/hwloc/hwloc.mk
> index 77a25a1775..8a08ab89c8 100644
> --- a/package/hwloc/hwloc.mk
> +++ b/package/hwloc/hwloc.mk
> @@ -27,6 +27,13 @@ HWLOC_CONF_OPTS = \
>  	--disable-libxml2 \

You forgot to drop this ^^^ ...

>  	--disable-doxygen
>  
> +ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
> +HWLOC_CONF_OPTS += --enable-libudev
> +HWLOC_DEPENDENCIES += udev
> +else
> +HWLOC_CONF_OPTS += --disable-libudev
> +endif
> +
>  ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y)
>  HWLOC_CONF_OPTS += --enable-pci
>  HWLOC_DEPENDENCIES += libpciaccess
> @@ -34,4 +41,19 @@ else
>  HWLOC_CONF_OPTS += --disable-pci
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBXML2),y)
> +HWLOC_CONF_OPTS += --enable-libxml2
> +HWLOC_DEPENDENCIES += libxml2
> +else
> +HWLOC_CONF_OPTS += --disable-libxml2
> +endif

... now that it is an optional dependency.

Since this fixes dependencies: applied to master with the above fixed,
thanks.

Regards,
Yann E. MORIN.

> +ifeq ($(BR2_PACKAGE_NCURSES),y)
> +HWLOC_DEPENDENCIES += ncurses
> +endif
> +
> +ifeq ($(BR2_PACKAGE_NUMACTL),y)
> +HWLOC_DEPENDENCIES += numactl
> +endif
> +
>  $(eval $(autotools-package))
> -- 
> 2.29.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 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl
  2021-05-23  9:43 [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl Bernd Kuhls
  2021-05-23 12:14 ` Yann E. MORIN
@ 2021-06-08  7:09 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-06-08  7:09 UTC (permalink / raw)
  To: buildroot

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > udev:
 > https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L626

 > libxml2:
 > https://github.com/open-mpi/hwloc/blob/master/config/hwloc.m4#L1273

 > ncurses:
 > https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L340

 > numactl:
 > https://github.com/open-mpi/hwloc/blob/master/config/hwloc_internal.m4#L419

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Committed to 2021.02.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-06-08  7:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-23  9:43 [Buildroot] [PATCH 1/1] package/hwloc: add optional dependencies to udev, libxml2, ncurses & numactl Bernd Kuhls
2021-05-23 12:14 ` Yann E. MORIN
2021-06-08  7:09 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.