1 files changed, 23 insertions, 14 deletions

diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
index 99b53e2e12..dda1d4350f 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
@@ -1,28 +1,21 @@
-From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001
+From 62193e52edfc71283b7bbcd6f590d63251290b3e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 6 Aug 2019 17:51:39 -0700
 Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled
 
 Upstream-Status: Inappropriate [Cross-compile specific]
+
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
+ Makefile.am  | 2 +-
  configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl,
-   [], [enable_tcl=yes])
- 
- if test "x$enable_tcl" != "xyes"; then
--  use_tcl="No (disabled)"
-+  use_tcl=""
- fi
- 
- if test "x$use_tcl" = "x"; then
+diff --git a/Makefile.am b/Makefile.am
+index fe373be..5db5cdc 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
+@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
  dist_man_MANS = graphviz.7
  
  # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
@@ -31,3 +24,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  
  .PHONY: doxygen
  doxygen:
+diff --git a/configure.ac b/configure.ac
+index 993a3dd..5e4a1ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1086,7 +1086,7 @@ AC_ARG_ENABLE(tcl,
+   [], [enable_tcl=yes])
+ 
+ if test "$enable_tcl" != "yes"; then
+-  use_tcl="No (disabled)"
++  use_tcl=""
+ fi
+ 
+ if test "$use_tcl" = ""; then
+-- 
+2.25.1
+