dont run tests on sparc64 same as ppc ppc64 add patch so graphviz knows

sparc linux use /usr/lib64
This commit is contained in:
Dennis Gilmore 2009-06-10 19:55:00 +00:00
parent 73af6edf95
commit aebf3ebea5
2 changed files with 19 additions and 3 deletions

View File

@ -0,0 +1,11 @@
--- graphviz-2.20.3/configure.BAD 2009-06-10 15:30:55.000000000 -0400
+++ graphviz-2.20.3/configure 2009-06-10 15:31:52.000000000 -0400
@@ -2595,7 +2595,7 @@
case "${host_os}" in
*linux* )
case "${host_cpu}" in
- powerpc64 | s390x | x86_64 )
+ powerpc64 | s390x | x86_64 | sparc64 )
LIBPOSTFIX="64"
;;
esac

View File

@ -1,13 +1,14 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 2.20.3 Version: 2.20.3
Release: 3%{?dist} Release: 4%{?dist}
Group: Applications/Multimedia Group: Applications/Multimedia
License: CPL License: CPL
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source0: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
Patch0: graphviz-2.20.3-configure-php.patch Patch0: graphviz-2.20.3-configure-php.patch
Patch1: graphviz-2.20.3-gv.i.patch Patch1: graphviz-2.20.3-gv.i.patch
Patch2: graphviz-2.20.3-sparc64-is-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2
BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig BuildRequires: /bin/ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig
@ -190,6 +191,7 @@ Various tcl packages (extensions) for the graphviz tools.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
# %%define NO_IO --disable-io # %%define NO_IO --disable-io
@ -224,8 +226,8 @@ cp -a %{buildroot}%{_datadir}/%{name}/doc __doc
rm -rf %{buildroot}%{_datadir}/%{name}/doc rm -rf %{buildroot}%{_datadir}/%{name}/doc
%check %check
%ifnarch ppc64 ppc %ifnarch ppc64 ppc sparc64
# regression test, segfaults on ppc/ppc64, possible endian issues? # regression test, segfaults on ppc/ppc64/sparc64, possible endian issues?
cd rtest cd rtest
make rtest make rtest
%endif %endif
@ -391,6 +393,9 @@ fi
%changelog %changelog
* Wed Jun 10 2009 Dennis Gilmore <dennis@ausil.us> 2.20.3-4
- disablre regression tests on sparc64 as well as ppc/ppc64
* Mon Mar 2 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.20.3-3 * Mon Mar 2 2009 Tom "spot" Callaway <tcallawa@redhat.com> 2.20.3-3
- this spec makes baby animals cry... massively clean it up - this spec makes baby animals cry... massively clean it up
- hack in java includes to build against openjdk - hack in java includes to build against openjdk