- added patch to avoid __unused macro collision on ppc64

This commit is contained in:
Martin Bacovsky 2007-03-12 12:19:54 +00:00
parent f777c7b825
commit ae2cef80c6
2 changed files with 30 additions and 0 deletions

28
file-4.20-unused.patch Normal file
View File

@ -0,0 +1,28 @@
--- file-4.20/src/file.c.unused 2007-03-12 13:13:17.000000000 +0100
+++ file-4.20/src/file.c 2007-03-12 13:15:50.000000000 +0100
@@ -358,7 +358,7 @@
private void
/*ARGSUSED*/
-load(const char *m __unused, int flags)
+load(const char *m f__unused, int flags)
{
if (magic)
return;
--- file-4.20/src/file.h.unused 2007-03-12 13:12:32.000000000 +0100
+++ file-4.20/src/file.h 2007-03-12 13:15:40.000000000 +0100
@@ -79,11 +79,11 @@
#endif
#endif
-#ifndef __unused
+#ifndef f__unused
#if __GNUC_PREREQ__(2, 7)
-#define __unused __attribute__((__unused__))
+#define f__unused __attribute__((__unused__))
#else
-#define __unused /* delete */
+#define f__unused /* delete */
#endif
#endif

View File

@ -22,6 +22,7 @@ Patch20: file-4.17-bash.patch
Patch21: file-4.19-ELF.patch
Patch22: file-4.19-ooffice.patch
Patch23: file-4.20-REG_STARTEND.patch
Patch24: file-4.20-unused.patch
Requires: file-libs = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -70,6 +71,7 @@ necessary for developing programs using libmagic.
%patch21 -p1 -b .ELF
%patch22 -p1 -b .ooffice
%patch23 -p1 -b .REG_STARTEND
%patch24 -p1 -b .unused
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
mv doc/libmagic.man_ doc/libmagic.man