graphviz: upgrade 8.1.0 -> 12.1.2

ChangeLog:
https://gitlab.com/graphviz/graphviz/-/blob/12.1.2/CHANGELOG.md

* Drop backport patch
  0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch
* Refresh patch

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao 2024-10-14 23:20:37 +08:00 committed by Khem Raj
parent a18a23df47
commit 2b6a5e790e
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 24 additions and 74 deletions

View File

@ -1,58 +0,0 @@
From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 9 Sep 2023 01:03:04 -0700
Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in
compilation flags
This was causing problems with cross-compilation with a dedicated sysroot,
because compilation would incorrectly use headers and libraries from the
`--prefix` path. The `--prefix` path is meant to indicate a target path to
install to, not a path from which to source dependent libraries.
Gitlab: fixes #2442
Reported-by: Daniel Klauer
Suggested-by: Daniel Klauer
Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848]
Signed-off-by: Daniel Klauer <daniel.klauer@gin.de>
---
CHANGELOG.md | 3 +++
configure.ac | 8 --------
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9b7e8e08..3a15fd256 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
longer fails due to missing PHP files. #2388
- Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in
Graphviz 2.50.0. #2404
+- The Autotools build system no longer uses headers and libraries from the
+ `--prefix` path given on the command line. This previously caused
+ cross-compilation to incorrectly pick up host headers and libraries. #2442
## [8.0.5] 2023-04-30
diff --git a/configure.ac b/configure.ac
index 573a3ee5d..7d53346de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then
AC_SUBST([prefix])
fi
-# automatically check for other dependencies in $prefix first
-if test "x${prefix}" != "x/usr"; then
- CPPFLAGS="$CPPFLAGS -I${prefix}/include"
- LDFLAGS="$LDFLAGS -L${prefix}/lib"
- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
-fi
-
dnl -----------------------------------
# Static/Shared binaries
--
2.34.1

View File

@ -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

View File

@ -19,7 +19,6 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native"
inherit autotools-brokensep pkgconfig gettext qemu
SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \
file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \
"
# Use native mkdefs
SRC_URI:append:class-target = "\
@ -28,7 +27,7 @@ SRC_URI:append:class-target = "\
SRC_URI:append:class-nativesdk = "\
file://graphviz-setup.sh \
"
SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565"
SRC_URI[sha256sum] = "cf9e6de9d5949dffbc4dd46f833085ff8e7e55482ffb84641819bbf0d18c5f02"
UPSTREAM_CHECK_URI = "https://graphviz.org/download/"
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"