diff mbox series

[meta-oe,scarthgap] graphviz: remove obsolete and problematic patch

Message ID 20241025033320.1479988-1-Qi.Chen@windriver.com
State New
Headers show
Series [meta-oe,scarthgap] graphviz: remove obsolete and problematic patch | expand

Commit Message

ChenQi Oct. 25, 2024, 3:33 a.m. UTC 
From: Chen Qi <Qi.Chen@windriver.com>

Remove 0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch.

This patch is obsolete and not needed because the current graphviz
configure.ac has correct logic of checking use_tcl. This use_tcl
variable needs to be set when '--disable-tcl' is set, otherwise,
things will behave as if no option is supplied and the configure
process will check tcl automatically.

This patch is problematic because its logic against the current version
is wrong. The recipe has already explicitly set '--disable-tcl', so
the configure process should not do automatic checking for tcl at do_configure.

This patch fixes do_configure error when host has tcl8.6-dev installed. The
error is like below:

  QA Issue: This autoconf log indicates errors, it looked at host include and/or
  library paths while determining system capabilities.
  Rerun configure task after fixing this. [configure-unsafe]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...o-be-empty-string-if-tcl-is-disabled.patch | 33 -------------------
 .../graphviz/graphviz_8.1.0.bb                |  4 ---
 2 files changed, 37 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
diff mbox series

Patch

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
deleted file mode 100644
index 99b53e2e12..0000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ /dev/null
@@ -1,33 +0,0 @@ 
-From 564901ab78da2b2b1bed92351dc3c102dc0a8154 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>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- 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
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
- dist_man_MANS = graphviz.7
- 
- # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
--SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests
-+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests
- 
- .PHONY: doxygen
- doxygen:
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb
index b3f02148be..5108f03233 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb
@@ -24,10 +24,6 @@  SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-re
            file://CVE-2023-46045-0002.patch \
            file://CVE-2023-46045-0003.patch \
            "
-# Use native mkdefs
-SRC_URI:append:class-target = "\
-           file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
-"
 SRC_URI:append:class-nativesdk = "\
            file://graphviz-setup.sh \
 "