[packages/graphviz] correctly save CPPFLAGS before testing guile

atler atler at pld-linux.org
Fri Jul 7 03:41:13 CEST 2023


commit f78ef2343a650b76252ddfefeeea54a1334cb1c5
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jul 7 01:50:22 2023 +0200

    correctly save CPPFLAGS before testing guile

 cppflags.patch | 11 +++++++++++
 graphviz.spec  |  2 ++
 2 files changed, 13 insertions(+)
---
diff --git a/graphviz.spec b/graphviz.spec
index 7ca832e..911b725 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -74,6 +74,7 @@ Patch12:	%{name}-webp.patch
 Patch14:	python-paths.patch
 Patch15:	ghostscript918.patch
 Patch16:	java.patch
+Patch17:	cppflags.patch
 URL:		http://www.graphviz.org/
 %{?with_devil:BuildRequires:	DevIL-devel}
 %{?with_r:BuildRequires:	R}
@@ -530,6 +531,7 @@ Wiązania graphviza dla języka R.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua5.1@' -i tclpkg/gv/demo/modgraph.lua
 
diff --git a/cppflags.patch b/cppflags.patch
new file mode 100644
index 0000000..3c456e8
--- /dev/null
+++ b/cppflags.patch
@@ -0,0 +1,11 @@
+--- graphviz-2.47.2/configure.ac.orig	2023-07-07 01:21:15.427742856 +0200
++++ graphviz-2.47.2/configure.ac	2023-07-07 01:49:04.518671957 +0200
+@@ -739,7 +739,7 @@
+ 			false)
+ 		])
+           ac_save_CFLAGS="$CFLAGS"
+-          ac_save_CPPFLAGS="$save_CPPFLAGS"
++          ac_save_CPPFLAGS="$CPPFLAGS"
+           CFLAGS="$CFLAGS $GUILE_INCLUDES"
+           CPPFLAGS="$CPPFLAGS $GUILE_INCLUDES"
+           AC_CHECK_HEADER(libguile.h,,[
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/f78ef2343a650b76252ddfefeeea54a1334cb1c5



More information about the pld-cvs-commit mailing list