diff options
| -rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb | 4 |
2 files changed, 0 insertions, 37 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 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 @@ | |||
| 1 | From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Tue, 6 Aug 2019 17:51:39 -0700 | ||
| 4 | Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate [Cross-compile specific] | ||
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 8 | --- | ||
| 9 | configure.ac | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | --- a/configure.ac | ||
| 13 | +++ b/configure.ac | ||
| 14 | @@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl, | ||
| 15 | [], [enable_tcl=yes]) | ||
| 16 | |||
| 17 | if test "x$enable_tcl" != "xyes"; then | ||
| 18 | - use_tcl="No (disabled)" | ||
| 19 | + use_tcl="" | ||
| 20 | fi | ||
| 21 | |||
| 22 | if test "x$use_tcl" = "x"; then | ||
| 23 | --- a/Makefile.am | ||
| 24 | +++ b/Makefile.am | ||
| 25 | @@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra | ||
| 26 | dist_man_MANS = graphviz.7 | ||
| 27 | |||
| 28 | # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS | ||
| 29 | -SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests | ||
| 30 | +SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests | ||
| 31 | |||
| 32 | .PHONY: doxygen | ||
| 33 | 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 | |||
| 24 | file://CVE-2023-46045-0002.patch \ | 24 | file://CVE-2023-46045-0002.patch \ |
| 25 | file://CVE-2023-46045-0003.patch \ | 25 | file://CVE-2023-46045-0003.patch \ |
| 26 | " | 26 | " |
| 27 | # Use native mkdefs | ||
| 28 | SRC_URI:append:class-target = "\ | ||
| 29 | file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \ | ||
| 30 | " | ||
| 31 | SRC_URI:append:class-nativesdk = "\ | 27 | SRC_URI:append:class-nativesdk = "\ |
| 32 | file://graphviz-setup.sh \ | 28 | file://graphviz-setup.sh \ |
| 33 | " | 29 | " |
