summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2024-10-25 11:32:27 +0800
committerKhem Raj <raj.khem@gmail.com>2024-10-25 07:40:01 -0700
commite05c3507c02f3ced42a88b4019e766ee5cbf2d4c (patch)
tree197e9fec2bb33ccd0586f8b0f94cc680b5d17a90
parent3c1228e793a9a6cbbfd27655774ad965976cfa4a (diff)
downloadmeta-openembedded-e05c3507c02f3ced42a88b4019e766ee5cbf2d4c.tar.gz
graphviz: remove obsolete and problematic patch
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> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch42
-rw-r--r--meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb4
2 files changed, 0 insertions, 46 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
deleted file mode 100644
index dda1d4350f..0000000000
--- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 62193e52edfc71283b7bbcd6f590d63251290b3e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 6 Aug 2019 17:51:39 -0700
4Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled
5
6Upstream-Status: Inappropriate [Cross-compile specific]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 Makefile.am | 2 +-
11 configure.ac | 2 +-
12 2 files changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index fe373be..5db5cdc 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/graphviz_version.h
19 dist_man_MANS = graphviz.7
20
21 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
22-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests
23+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests
24
25 .PHONY: doxygen
26 doxygen:
27diff --git a/configure.ac b/configure.ac
28index 993a3dd..5e4a1ad 100644
29--- a/configure.ac
30+++ b/configure.ac
31@@ -1086,7 +1086,7 @@ AC_ARG_ENABLE(tcl,
32 [], [enable_tcl=yes])
33
34 if test "$enable_tcl" != "yes"; then
35- use_tcl="No (disabled)"
36+ use_tcl=""
37 fi
38
39 if test "$use_tcl" = ""; then
40--
412.25.1
42
diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb b/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb
index 1843091aaf..50243da344 100644
--- a/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb
+++ b/meta-oe/recipes-graphics/graphviz/graphviz_12.1.2.bb
@@ -20,10 +20,6 @@ inherit autotools-brokensep pkgconfig gettext qemu
20 20
21SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \ 21SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
22 " 22 "
23# Use native mkdefs
24SRC_URI:append:class-target = "\
25 file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
26"
27SRC_URI:append:class-nativesdk = "\ 23SRC_URI:append:class-nativesdk = "\
28 file://graphviz-setup.sh \ 24 file://graphviz-setup.sh \
29" 25"