helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtr: update to 0.86

Browse Source 
* Newer automake compatibility fixed upstream, so drop patches.
* LIC_FILES_CHKSUM changed due to a trailing space being removed, no
  actual change to the license text.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Paul Eggleton 2015-01-05 10:51:28 +00:00 committed by Joe MacDonald
parent de672e6a9e
commit 95039ef76b
3 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta-networking/recipes-support/mtr/files/configure.patch
View File

@ -1,12 +0,0 @@
Index: mtr-0.82/configure.in
===================================================================
--- mtr-0.82.orig/configure.in 2014-07-16 19:52:56.306026346 +0000
+++ mtr-0.82/configure.in 2014-07-17 21:59:03.208587150 +0000
@@ -1,5 +1,5 @@
-AC_INIT(mtr.c)
-AM_INIT_AUTOMAKE(mtr, 0.82)
+AC_INIT(mtr.c, 0.82)
+AM_INIT_AUTOMAKE([foreign])
AC_SUBST(GTK_OBJ)

31
meta-networking/recipes-support/mtr/files/no-gtk.patch
View File

@ -1,31 +0,0 @@
Disable gtk check that breaks with current autotools
Ideally we would have a proper fix for this and send that upstream instead.
Upstream-Status: Pending
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
diff --git a/configure.in b/configure.in
index 8474543..5118565 100644
--- a/configure.in
+++ b/configure.in
@@ -48,16 +48,8 @@ AC_ARG_ENABLE(ipv6,
[ --disable-ipv6 Do not enable IPv6],
WANTS_IPV6=$enableval, WANTS_IPV6=yes)
-if test "x$WANTS_GTK" = "xyes"; then
- AM_PATH_GTK_2_0(2.6.0, CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS -lm",
- AC_MSG_WARN(Building without GTK2 display support)
- AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
- GTK_OBJ="")
-else
- AC_DEFINE(NO_GTK)
- GTK_OBJ=""
-fi
+AC_DEFINE(NO_GTK, 1, [Define if you don't have the GTK+ libraries available.])
+GTK_OBJ=""
AC_CHECK_FUNC(socket, ,
AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))

10
meta-networking/recipes-support/mtr/mtr_0.82.bb → meta-networking/recipes-support/mtr/mtr_0.86.bb
View File

@ -5,14 +5,12 @@ DEPENDS = "ncurses"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://mtr.c;beginline=5;endline=16;md5=56e390ced194aff352eefab404883057"
file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz \
file://configure.patch \
file://no-gtk.patch"
SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz"
SRC_URI[md5sum] = "10601ea543fda3e51545c4bce195b64c"
SRC_URI[sha256sum] = "f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0"
SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2"
SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06"
inherit autotools