rpms/binutils/devel binutils.spec,1.102,1.103
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Sep 12 12:34:19 UTC 2006
Author: jakub
Update of /cvs/dist/rpms/binutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26094
Modified Files:
binutils.spec
Log Message:
2.17.50.0.3-6
Index: binutils.spec
===================================================================
RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- binutils.spec 12 Sep 2006 10:44:56 -0000 1.102
+++ binutils.spec 12 Sep 2006 12:34:17 -0000 1.103
@@ -1,7 +1,7 @@
Summary: A GNU collection of binary utilities.
Name: binutils
Version: 2.17.50.0.3
-Release: 5
+Release: 6
License: GPL
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@@ -135,6 +135,23 @@
rm -f %{buildroot}%{_infodir}/dir
rm -rf %{buildroot}%{_prefix}/%{_target_platform}
+%ifarch %{ix86} x86_64 ppc ppc64 s390 s390x sparc sparc64
+sed -i -e '/^#include "ansidecl.h"/{p;s~^.*$~#include <bits/wordsize.h>~;}' \
+%ifarch %{ix86} x86_64
+ -e 's/^#define BFD_ARCH_SIZE \(32\|64\) *$/#define BFD_ARCH_SIZE __WORDSIZE/' \
+%endif
+ -e 's/^#define BFD_DEFAULT_TARGET_SIZE \(32\|64\) *$/#define BFD_DEFAULT_TARGET_SIZE __WORDSIZE/' \
+ -e 's/^#define BFD_HOST_64BIT_LONG [01] *$/#define BFD_HOST_64BIT_LONG (__WORDSIZE == 64)/' \
+ -e 's/^#define BFD_HOST_64_BIT \(long \)\?long *$/#if __WORDSIZE == 32\
+#define BFD_HOST_64_BIT long long\
+#else\
+#define BFD_HOST_64_BIT long\
+#endif/' \
+ -e 's/^#define BFD_HOST_U_64_BIT unsigned \(long \)\?long *$/#define BFD_HOST_U_64_BIT unsigned BFD_HOST_64_BIT/' \
+ %{buildroot}%{_prefix}/include/bfd.h
+%endif
+touch -r ../bfd/bfd-in2.h %{buildroot}%{_prefix}/include/bfd.h
+
cd ..
%find_lang binutils
%find_lang opcodes
@@ -196,6 +213,9 @@
%{_infodir}/bfd*info*
%changelog
+* Tue Sep 12 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-6
+- fix multilib conflict in %{_prefix}/include/bfd.h
+
* Tue Sep 12 2006 Jakub Jelinek <jakub at redhat.com> 2.17.50.0.3-5
- fix efi-app-ia64 magic number (#206002, BZ#3171)
More information about the fedora-cvs-commits
mailing list