* [Buildroot] [PATCH 1/2] package/mtr: use ncurses option
@ 2021-09-26 21:15 Fabrice Fontaine
2021-09-26 21:15 ` [Buildroot] [PATCH 2/2] package/mtr: bump to version 0.94 Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-09-26 21:15 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Use --with-ncurses and --without-ncurses options which are available
since version 0.88 and
https://github.com/traviscross/mtr/commit/4e2a948a167d9b8a0a63b46a423d4ae1519ad759
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mtr/mtr.mk | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk
index 7198cbcc1c..0400a12021 100644
--- a/package/mtr/mtr.mk
+++ b/package/mtr/mtr.mk
@@ -10,10 +10,16 @@ MTR_AUTORECONF = YES
MTR_CONF_OPTS = --without-gtk
MTR_DEPENDENCIES = \
host-pkgconf \
- $(if $(BR2_PACKAGE_LIBCAP),libcap) \
- $(if $(BR2_PACKAGE_NCURSES),ncurses)
+ $(if $(BR2_PACKAGE_LIBCAP),libcap)
MTR_LICENSE = GPL-2.0
MTR_LICENSE_FILES = COPYING
MTR_SELINUX_MODULES = netutils
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+MTR_CONF_OPTS += --with-ncurses
+MTR_DEPENDENCIES += ncurses
+else
+MTR_CONF_OPTS += --without-ncurses
+endif
+
$(eval $(autotools-package))
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread* [Buildroot] [PATCH 2/2] package/mtr: bump to version 0.94
2021-09-26 21:15 [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Fabrice Fontaine
@ 2021-09-26 21:15 ` Fabrice Fontaine
2021-09-27 14:35 ` [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Arnout Vandecappelle
2021-10-06 14:19 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2021-09-26 21:15 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
- Add jansson optional dependency:
https://github.com/traviscross/mtr/commit/c2739eaf139b96f4b4937aee9aa484f0e6d1df55
- Add libgtk3 optional dependency:
https://github.com/traviscross/mtr/commit/5bd8e6c3ba67fdb9445b1ddc3777aca3b0f7053e
- Update indentation in hash file (two spaces)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/mtr/mtr.hash | 4 ++--
package/mtr/mtr.mk | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/package/mtr/mtr.hash b/package/mtr/mtr.hash
index 7771e091e2..d6062ef08f 100644
--- a/package/mtr/mtr.hash
+++ b/package/mtr/mtr.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 3a1ab330104ddee3135af3cfa567b9608001c5deecbf200c08b545ed6d7a4c8f mtr-0.93.tar.gz
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+sha256 ea036fdd45da488c241603f6ea59a06bbcfe6c26177ebd34fff54336a44494b8 mtr-0.94.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk
index 0400a12021..07c58a1e93 100644
--- a/package/mtr/mtr.mk
+++ b/package/mtr/mtr.mk
@@ -4,10 +4,9 @@
#
################################################################################
-MTR_VERSION = 0.93
+MTR_VERSION = 0.94
MTR_SITE = $(call github,traviscross,mtr,v$(MTR_VERSION))
MTR_AUTORECONF = YES
-MTR_CONF_OPTS = --without-gtk
MTR_DEPENDENCIES = \
host-pkgconf \
$(if $(BR2_PACKAGE_LIBCAP),libcap)
@@ -15,6 +14,20 @@ MTR_LICENSE = GPL-2.0
MTR_LICENSE_FILES = COPYING
MTR_SELINUX_MODULES = netutils
+ifeq ($(BR2_PACKAGE_JANSSON),y)
+MTR_CONF_OPTS += --with-jansson
+MTR_DEPENDENCIES += jansson
+else
+MTR_CONF_OPTS += --without-jansson
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
+MTR_CONF_OPTS += --with-gtk
+MTR_DEPENDENCIES += libgtk3
+else
+MTR_CONF_OPTS += --without-gtk
+endif
+
ifeq ($(BR2_PACKAGE_NCURSES),y)
MTR_CONF_OPTS += --with-ncurses
MTR_DEPENDENCIES += ncurses
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/mtr: use ncurses option
2021-09-26 21:15 [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Fabrice Fontaine
2021-09-26 21:15 ` [Buildroot] [PATCH 2/2] package/mtr: bump to version 0.94 Fabrice Fontaine
@ 2021-09-27 14:35 ` Arnout Vandecappelle
2021-10-06 14:19 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-09-27 14:35 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 26/09/2021 23:15, Fabrice Fontaine wrote:
> Use --with-ncurses and --without-ncurses options which are available
> since version 0.88 and
> https://github.com/traviscross/mtr/commit/4e2a948a167d9b8a0a63b46a423d4ae1519ad759
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Both applied to master, thanks.
Regards,
Arnout
> ---
> package/mtr/mtr.mk | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/mtr/mtr.mk b/package/mtr/mtr.mk
> index 7198cbcc1c..0400a12021 100644
> --- a/package/mtr/mtr.mk
> +++ b/package/mtr/mtr.mk
> @@ -10,10 +10,16 @@ MTR_AUTORECONF = YES
> MTR_CONF_OPTS = --without-gtk
> MTR_DEPENDENCIES = \
> host-pkgconf \
> - $(if $(BR2_PACKAGE_LIBCAP),libcap) \
> - $(if $(BR2_PACKAGE_NCURSES),ncurses)
> + $(if $(BR2_PACKAGE_LIBCAP),libcap)
> MTR_LICENSE = GPL-2.0
> MTR_LICENSE_FILES = COPYING
> MTR_SELINUX_MODULES = netutils
>
> +ifeq ($(BR2_PACKAGE_NCURSES),y)
> +MTR_CONF_OPTS += --with-ncurses
> +MTR_DEPENDENCIES += ncurses
> +else
> +MTR_CONF_OPTS += --without-ncurses
> +endif
> +
> $(eval $(autotools-package))
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/mtr: use ncurses option
2021-09-26 21:15 [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Fabrice Fontaine
2021-09-26 21:15 ` [Buildroot] [PATCH 2/2] package/mtr: bump to version 0.94 Fabrice Fontaine
2021-09-27 14:35 ` [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Arnout Vandecappelle
@ 2021-10-06 14:19 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2021-10-06 14:19 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Use --with-ncurses and --without-ncurses options which are available
> since version 0.88 and
> https://github.com/traviscross/mtr/commit/4e2a948a167d9b8a0a63b46a423d4ae1519ad759
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-06 14:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-26 21:15 [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Fabrice Fontaine
2021-09-26 21:15 ` [Buildroot] [PATCH 2/2] package/mtr: bump to version 0.94 Fabrice Fontaine
2021-09-27 14:35 ` [Buildroot] [PATCH 1/2] package/mtr: use ncurses option Arnout Vandecappelle
2021-10-06 14:19 ` 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.