- fix build on ppc* (#1144072)

This commit is contained in:
Dan Horák 2014-11-05 17:02:17 +01:00
parent f23473a0b9
commit b72deb9a39
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff -up wrk/include/glibc_elf.h.wrk wrk/include/glibc_elf.h
--- wrk/include/glibc_elf.h.wrk 2014-09-19 16:04:45.546981432 +0200
+++ wrk/include/glibc_elf.h 2014-09-19 16:38:55.407991682 +0200
@@ -2081,7 +2081,8 @@ typedef Elf32_Addr Elf32_Conflict;
#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
/* Keep this the last entry. */
-#define R_PPC64_NUM 107
+//symbol conflicting with system headers on ppc64le and nowhere used
+//#define R_PPC64_NUM 107
/* PowerPC64 specific values for the Dyn d_tag field. */
#define DT_PPC64_GLINK (DT_LOPROC + 0)

View File

@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities
Name: cdrkit
Version: 1.1.11
Release: 24%{?dist}
Release: 25%{?dist}
License: GPLv2
Group: Applications/System
URL: http://cdrkit.org/
@ -24,6 +24,7 @@ Patch15: cdrkit-1.1.11-utf8.patch
Patch16: cdrkit-1.1.11-cmakewarn.patch
Patch17: cdrkit-1.1.11-memset.patch
Patch18: cdrkit-1.1.11-paranoiacdio.patch
Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@ -134,6 +135,7 @@ SCSI devices.
%patch16 -p1 -b .cmakewarn
%patch17 -p1 -b .edcspeed
%patch18 -p1 -b .paranoiacdio
%patch19 -p1 -b .elfheader
# we do not want bundled paranoia library
rm -rf libparanoia
@ -298,6 +300,9 @@ fi
%{_includedir}/usal
%changelog
* Wed Nov 05 2014 Dan Horák <dan[at]danny.cz> - 1.1.11-25
- fix build on ppc* (#1144072)
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild