mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-17 19:34:30 +00:00
graphviz: Do not build tcl support for target
tclpkg looks for tclsh on buildhost and if we try to use the native version then it groks the paths from the native sysroot and builds and installs the target tcl packages into the same path, in the end it ends up being wrongly packaged. Therefore its best to disable tcl Secondly, package python and perl pieces into independent packages so the runtime dependencies are also set accordingly. Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
2cb6ed738e
commit
e839371c35
@ -0,0 +1,33 @@
|
||||
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
|
||||
@@ -1676,7 +1676,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
|
||||
@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra
|
||||
man_MANS = graphviz.7
|
||||
|
||||
# $(subdirs) contains the list from: AC_CONFIG_SUBDIRS
|
||||
-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests
|
||||
+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests
|
||||
|
||||
.PHONY: doxygen
|
||||
doxygen:
|
||||
@ -29,7 +29,10 @@ SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/g
|
||||
file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \
|
||||
"
|
||||
# Use native mkdefs
|
||||
SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch"
|
||||
SRC_URI_append_class-target = "\
|
||||
file://0001-Use-native-mkdefs.patch \
|
||||
file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072"
|
||||
SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a"
|
||||
|
||||
@ -40,6 +43,7 @@ EXTRA_OECONF_class-target = "\
|
||||
--with-expatlibdir=${STAGING_LIBDIR} \
|
||||
--without-included-ltdl \
|
||||
--disable-java \
|
||||
--disable-tcl \
|
||||
--disable-r \
|
||||
--disable-sharp \
|
||||
"
|
||||
@ -55,6 +59,19 @@ do_install_append_class-native() {
|
||||
install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir}
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo"
|
||||
|
||||
FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/"
|
||||
FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/"
|
||||
FILES_${PN}-demo += "${datadir}/graphviz/demo/"
|
||||
|
||||
RDEPENDS_${PN}-perl += "perl"
|
||||
RDEPENDS_${PN}-python += "python"
|
||||
RDEPENDS_${PN}-demo += "python perl"
|
||||
|
||||
INSANE_SKIP_${PN}-perl = "dev-so"
|
||||
INSANE_SKIP_${PN}-python = "dev-so"
|
||||
|
||||
FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user