diff --git a/graphviz-2.40.1-python3.patch b/graphviz-2.40.1-python3.patch index 6e6c172d0878edfde76a346092a139d3544d7d33..0c3e3155383fbf25195430a2f2b9386a10b02cb4 100644 --- a/graphviz-2.40.1-python3.patch +++ b/graphviz-2.40.1-python3.patch @@ -22,7 +22,7 @@ index b747045..2b1ac8d 100644 - + print(sysconfig.get_python_lib(0,0)) diff --git a/configure.ac b/configure.ac -index 51166c3..4d8c9a0 100644 +index 51166c3..0f18965 100644 --- a/configure.ac +++ b/configure.ac @@ -1142,7 +1142,7 @@ else @@ -34,20 +34,18 @@ index 51166c3..4d8c9a0 100644 if test "x$PYTHON" = "x"; then use_python="No (python not available)" else -@@ -1167,8 +1167,11 @@ else +@@ -1167,8 +1167,8 @@ else if test "x$PYTHON" = "x"; then use_python="No (python is too old)" else - 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_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT -+ if test $PYTHON_VERSION_MAJOR -gt 2; then -+ PYTHON_INCLUDES="${PYTHON_INCLUDES}m" -+ fi ++ PYTHON_INCLUDES=`$PYTHON-config --includes` # PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT" PYTHON_LIBS="-undefined dynamic_lookup" 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 use_python34="No (python34 is too old)" else diff --git a/graphviz.spec b/graphviz.spec index dacecf7854c14e43bb5b8fe9a0d28a400bc84639..f2d9a041e53b4ea284db44592c39368c6828e27e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -16,7 +16,7 @@ Name: graphviz Version: 2.40.1 -Release: 38 +Release: 39 Summary: Graph Visualization Tools License: EPL URL: http://www.graphviz.org/ @@ -172,11 +172,12 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon cp -a tclpkg/gv tclpkg/gv.python2 %endif -%make_build 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}" \ - 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} - + %if %{with python2} cd tclpkg/gv.python2 %make_build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-overflow %{?FFSTORE}" \ @@ -188,9 +189,12 @@ cd tclpkg/gv.python2 %install -%make_install docdir=%{buildroot}%{_docdir}/%{name} \ - pkgconfigdir=%{_libdir}/pkgconfig PYTHON_LIBS="-lpython%{python3_version}m" \ - PYTHON_INSTALL_DIR=%{python3_sitearch} install +make DESTDIR=%{buildroot} \ + docdir=%{buildroot}%{_docdir}/%{name} \ + pkgconfigdir=%{_libdir}/pkgconfig \ + PYTHON_LIBS=`python3-config --libs` \ + PYTHON_INSTALL_DIR=%{python3_sitearch} \ + install %delete_la @@ -317,6 +321,12 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ %changelog +* Tue Jun 23 2020 xinghe - 2.40.1-39 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Repair compilation failure + * Tue Dec 31 2019 openEuler Buildteam - 2.40.1-38 - Type:bugfix - ID:NA @@ -324,4 +334,4 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/ - DESC:optimization the spec * Thu Sep 19 2019 hufeng - 2.40.1-37 --Create spec +-Create spec \ No newline at end of file