diff options
Diffstat (limited to 'meta-networking/recipes-support/mtr/files')
-rw-r--r-- | meta-networking/recipes-support/mtr/files/configure.patch | 12 | ||||
-rw-r--r-- | meta-networking/recipes-support/mtr/files/no-gtk.patch | 31 |
2 files changed, 0 insertions, 43 deletions
diff --git a/meta-networking/recipes-support/mtr/files/configure.patch b/meta-networking/recipes-support/mtr/files/configure.patch deleted file mode 100644 index c978b879ec..0000000000 --- a/meta-networking/recipes-support/mtr/files/configure.patch +++ /dev/null @@ -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) diff --git a/meta-networking/recipes-support/mtr/files/no-gtk.patch b/meta-networking/recipes-support/mtr/files/no-gtk.patch deleted file mode 100644 index 0dbeb7a297..0000000000 --- a/meta-networking/recipes-support/mtr/files/no-gtk.patch +++ /dev/null @@ -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))) |