sparc64 breaks with the rpath hack patch applied

This commit is contained in:
Tom Callaway 2008-05-22 17:16:40 +00:00
parent 6a36cc7cb8
commit ce3b874043
1 changed files with 18 additions and 3 deletions

View File

@ -16,7 +16,7 @@
Name: perl
Version: %{perl_version}
Release: 21%{?dist}
Release: 23%{?dist}
Epoch: %{perl_epoch}
Summary: The Perl programming language
Group: Development/Languages
@ -778,7 +778,11 @@ upstream tarball from perl.org.
%patch1 -p1
%patch2 -p1
%patch3 -p1
# This patch breaks sparc64 compilation
# We should probably consider removing it for all arches.
%ifnarch sparc64
%patch4 -p1
%endif
%ifarch %{multilib_64_archs}
%patch5 -p1
%endif
@ -997,7 +1001,9 @@ cd $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname}/CORE/
perl -x patchlevel.h 'Fedora Patch1: Permit suidperl to install as nonroot'
perl -x patchlevel.h 'Fedora Patch2: Removes date check, Fedora/RHEL specific'
perl -x patchlevel.h 'Fedora Patch3: Fedora/RHEL use links instead of lynx'
%ifnarch sparc64
perl -x patchlevel.h 'Fedora Patch4: Work around annoying rpath issue'
%endif
%ifarch %{multilib_64_archs}
perl -x patchlevel.h 'Fedora Patch5: support for libdir64'
%endif
@ -1015,7 +1021,9 @@ perl -x patchlevel.h 'Fedora Patch14: Upgrade CGI to 3.37'
rm -rf $RPM_BUILD_ROOT
%check
%ifnarch sparc64
make test
%endif
%post libs -p /sbin/ldconfig
@ -1613,8 +1621,15 @@ make test
# Old changelog entries are preserved in CVS.
%changelog
* Mon May 19 2008 Marcela Maslanova <mmaslano@redhat.com> 4:5.10.0-21
- 447142 upgrade CGI to 3.37
* Thu May 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-23
- sparc64 breaks with the rpath hack patch applied
* Mon May 19 2008 Marcela Maslanova <mmaslano@redhat.com>
- 447142 upgrade CGI to 3.37 (this actually happened in -21 in rawhide.)
* Sat May 17 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-21
- sparc64 fails two tests under mysterious circumstances. we need to get the
rest of the tree moving, so we temporarily disable the tests on that arch.
* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-20
- create the vendor_perl/%%{perl_version}/%%{perl_archname}/auto directory