fix build on s390x

This commit is contained in:
Dan Horák 2012-05-18 13:23:53 +02:00
parent fd5f385f5e
commit ef1432535f
2 changed files with 19 additions and 1 deletions

View File

@ -3,11 +3,13 @@ Name: pcp
Version: 3.6.3 Version: 3.6.3
%define buildversion 1 %define buildversion 1
Release: %{buildversion}%{?dist} Release: %{buildversion}%{?dist}.1
License: GPLv2 License: GPLv2
URL: http://oss.sgi.com/projects/pcp URL: http://oss.sgi.com/projects/pcp
Group: Applications/System Group: Applications/System
Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz
# recognize s390x as 64-bit arch
Patch0: pcp_configure_s390x.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: procps autoconf bison flex ncurses-devel readline-devel BuildRequires: procps autoconf bison flex ncurses-devel readline-devel
@ -179,6 +181,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .s390x
autoconf autoconf
%configure %configure
@ -356,6 +359,9 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Fri May 18 2012 Dan Horák <dan[at]danny.cz> - 3.6.3-1.1
- fix build on s390x
* Mon Apr 30 2012 Mark Goodwin - 3.6.3-1 * Mon Apr 30 2012 Mark Goodwin - 3.6.3-1
- Update to latest PCP sources - Update to latest PCP sources

12
pcp_configure_s390x.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up pcp-3.6.3/configure.in.s390x pcp-3.6.3/configure.in
--- pcp-3.6.3/configure.in.s390x 2012-05-18 12:31:14.000000000 +0200
+++ pcp-3.6.3/configure.in 2012-05-18 12:31:47.000000000 +0200
@@ -1636,7 +1636,7 @@ if test $target_os = mingw
then
pcp_lib_dir=/local/bin
pcp_lib32_dir=/local/bin
-elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 \) -a $target_distro != debian
+elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 -o $target_cpu = s390x \) -a $target_distro != debian
then
# Linux on x86_64 and ppc64 puts libraries in .../lib64 (and rpmbuild
# enforces that convention) but $libdir lies about it.