rpms/graphviz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed FTBFS with python-3.8

Browse Source
This commit is contained in:
Jaroslav Škarvada 2019-06-03 22:48:04 +02:00
parent d0e354736b
commit 442aa53108
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graphviz-2.40.1-python3.patch
View File

@ -22,7 +22,7 @@ index b747045..2b1ac8d 100644
- -
+ print(sysconfig.get_python_lib(0,0)) + print(sysconfig.get_python_lib(0,0))
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 51166c3..4d8c9a0 100644 index 51166c3..0f18965 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1142,7 +1142,7 @@ else @@ -1142,7 +1142,7 @@ else
@ -34,20 +34,18 @@ index 51166c3..4d8c9a0 100644
if test "x$PYTHON" = "x"; then if test "x$PYTHON" = "x"; then
use_python="No (python not available)" use_python="No (python not available)"
else else
@@ -1167,8 +1167,11 @@ else @@ -1167,8 +1167,8 @@ else
if test "x$PYTHON" = "x"; then if test "x$PYTHON" = "x"; then
use_python="No (python is too old)" use_python="No (python is too old)"
else else
- PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"` - PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
- PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
+ PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"` + PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT + PYTHON_INCLUDES=`$PYTHON-config --includes`
+ if test $PYTHON_VERSION_MAJOR -gt 2; then
+ PYTHON_INCLUDES="${PYTHON_INCLUDES}m"
+ fi
# PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT" # PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
PYTHON_LIBS="-undefined dynamic_lookup" PYTHON_LIBS="-undefined dynamic_lookup"
PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`" PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
@@ -1548,7 +1551,7 @@ else @@ -1548,7 +1548,7 @@ else
if test "x$PYTHON34" = "x"; then if test "x$PYTHON34" = "x"; then
use_python34="No (python34 is too old)" use_python34="No (python34 is too old)"
else else

9
graphviz.spec
View File

@ -61,7 +61,7 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 2.40.1 Version: 2.40.1
Release: 49%{?dist} Release: 50%{?dist}
License: EPL-1.0 License: EPL-1.0
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
# A bit hacking needed due to: https://gitlab.com/graphviz/graphviz/issues/1371 # A bit hacking needed due to: https://gitlab.com/graphviz/graphviz/issues/1371
@ -346,7 +346,7 @@ cp -a tclpkg/gv tclpkg/gv.python2
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \
PYTHON_INCLUDES=-I/usr/include/python%{python3_version}m PYTHON_LIBS="-lpython%{python3_version}m" \ PYTHON_INCLUDES=`python3-config --includes` PYTHON_LIBS=`python3-config --libs` \
PYTHON_INSTALL_DIR=%{python3_sitearch} PYTHON=%{__python3} PYTHON_INSTALL_DIR=%{python3_sitearch} PYTHON=%{__python3}
%if %{with python2} %if %{with python2}
@ -363,7 +363,7 @@ rm -rf %{buildroot}
make DESTDIR=%{buildroot} \ make DESTDIR=%{buildroot} \
docdir=%{buildroot}%{_docdir}/%{name} \ docdir=%{buildroot}%{_docdir}/%{name} \
pkgconfigdir=%{_libdir}/pkgconfig \ pkgconfigdir=%{_libdir}/pkgconfig \
PYTHON_LIBS="-lpython%{python3_version}m" \ PYTHON_LIBS=`python3-config --libs` \
PYTHON_INSTALL_DIR=%{python3_sitearch} \ PYTHON_INSTALL_DIR=%{python3_sitearch} \
install install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@ -611,6 +611,9 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl* %{_mandir}/man3/*.3tcl*
%changelog %changelog
* Mon Jun 3 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.40.1-50
- Fixed FTBFS with python-3.8
* Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.40.1-49 * Sat Jun 01 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2.40.1-49
- Perl 5.30 rebuild - Perl 5.30 rebuild