rpms/rpm
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed missing lib64 library support for ppc64p7 (#817282)

Browse Source
This commit is contained in:
Phil Knirsch 2012-04-30 17:23:17 +02:00
parent ae517e7f5a
commit f1acb5f031
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpm-4.9.1.3-ppc64p7-platform.patch
View File

@ -1,6 +1,6 @@
diff -up rpm-4.9.1.3/installplatform.ppc64p7-platform rpm-4.9.1.3/installplatform
--- rpm-4.9.1.3/installplatform.ppc64p7-platform 2012-04-25 14:13:45.000000000 +0200
+++ rpm-4.9.1.3/installplatform 2012-04-25 14:24:53.401513816 +0200
--- rpm-4.9.1.3/installplatform.ppc64p7-platform 2012-04-25 14:25:25.554388624 +0200
+++ rpm-4.9.1.3/installplatform 2012-04-30 17:21:45.013388696 +0200
@@ -22,7 +22,7 @@ case "$arch" in
arm*) SUBSTS='s_arm_arm_ s_arm_armv3l_ s_arm_armv4l_ s_arm_armv4tl_ s_arm_armv5tel_ s_arm_armv5tejl_ s_arm_armv6l_ s_arm_armv7l_ s_arm_armv7hl_ s_arm_armv7hnl_' ;;
sh4*) SUBSTS='s_sh4_sh4_ s_sh4_sh4a_' ;;
@ -10,3 +10,12 @@ diff -up rpm-4.9.1.3/installplatform.ppc64p7-platform rpm-4.9.1.3/installplatfor
s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;;
x86_64|amd64|ia32e) SUBSTS='s,x86_64,x86_64, s,x86_64,ia32e, s,x86_64,amd64, s,x86_64,i386, s,x86_64,i486, s,x86_64,i586, s,x86_64,i686, s,x86_64,pentium3, s,x86_64,pentium4, s,x86_64,athlon, s,x86_64,geode,' ;;
*) SUBSTS=y___ ;;
@@ -48,7 +48,7 @@ for SUBST in $SUBSTS ; do
case "${ARCH}-${OS}" in
sparc64*-linux) LIB=lib64 ;;
s390x-linux) LIB=lib64 ;;
- ppc64-linux|powerpc64-linux) LIB=lib64 ;;
+ ppc64-linux|ppc64p7-linux|powerpc64-linux) LIB=lib64 ;;
x86_64-linux|amd64-linux|ia32e-linux) LIB=lib64 ;;
*) LIB=lib;;
esac

5
rpm.spec
View File

@ -21,7 +21,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}4%{?dist}
Release: %{?snapver:0.%{snapver}.}5%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.9.x/%{name}-%{srcver}.tar.bz2
@ -476,6 +476,9 @@ exit 0
%doc COPYING doc/librpm/html/*
%changelog
* Mon Apr 30 2012 Phil Knirsch <pknirsch@redhat.com> 4.9.1.3-5
- Fixed missing lib64 library support for ppc64p7 (#817282)
* Wed Apr 25 2012 Phil Knirsch <pknirsch@redhat.com> 4.9.1.3-4
- Fixed an issue with the ppc64p7 support where on 32bit ppc the detection would go horribly wrong