packages: binutils/binutils.spec - restore gold bcond from r1.333

[glen]

Author: glen                         Date: Mon Jun 25 06:50:01 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore gold bcond from r1.333

---- Files affected:
packages/binutils:
   binutils.spec (1.370 -> 1.371) 

---- Diffs:

================================================================
Index: packages/binutils/binutils.spec
diff -u packages/binutils/binutils.spec:1.370 packages/binutils/binutils.spec:1.371
--- packages/binutils/binutils.spec:1.370	Thu Jun 14 22:40:47 2012
+++ packages/binutils/binutils.spec	Mon Jun 25 08:49:56 2012
@@ -5,9 +5,14 @@
 # define addtargets x,y,z	# build with additional targets x,y,z (e.g. x86_64-linux)
 				# http://sourceware.org/ml/binutils/2008-03/msg00162.html
 %bcond_without	pax		# without PaX flags (for upstream bugreports)
+%bcond_without	gold		# don't build gold (no C++ dependencies)
 %bcond_without	default_ld	# default ld instead of gold
 %bcond_without	tests
-#
+
+%ifnarch %{ix86} %{x8664}
+%undefine	with_gold
+%endif
+
 Summary:	GNU Binary Utility Development Utilities
 Summary(de.UTF-8):	GNU Binary Utility Development Utilities
 Summary(es.UTF-8):	Utilitarios para desarrollo de binarios de la GNU
@@ -45,7 +50,7 @@
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-BuildRequires:	libstdc++-devel >= 6:4.0-1
+%{?with_gold:BuildRequires:	libstdc++-devel >= 6:4.0-1}
 %{?with_tests:BuildRequires:	libstdc++-static >= 6:4.0}
 BuildRequires:	perl-tools-pod
 %ifarch sparc sparc32
@@ -225,7 +230,7 @@
 	%{?with_allarchs:--enable-64-bit-bfd} \
 %endif
 	%{?with_allarchs:--enable-targets=alpha-linux,arm-linux,cris-linux,hppa-linux,i386-linux,ia64-linux,x86_64-linux,m68k-linux,mips-linux,mips64-linux,mips64el-linux,mipsel-linux,ppc-linux,s390-linux,s390x-linux,sh-linux,sparc-linux,sparc64-linux,i386-linuxaout} \
-%ifarch %{ix86} %{x8664}
+%if %{with gold}
 	--enable-gold%{!?with_default_ld:=default} --enable-ld%{?with_default_ld:=default} \
 %endif
 
@@ -247,8 +252,8 @@
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-install include/libiberty.h $RPM_BUILD_ROOT%{_includedir}
-install libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
+cp -p include/libiberty.h $RPM_BUILD_ROOT%{_includedir}
+cp -p libiberty/pic/libiberty.a $RPM_BUILD_ROOT%{_libdir}
 
 # remove evil -L pointing inside builder's home
 perl -pi -e 's at -L[^ ]*/pic @@g' $RPM_BUILD_ROOT%{_libdir}/libbfd.la
@@ -261,12 +266,10 @@
 %find_lang binutils
 %find_lang gas
 %find_lang gprof
-touch ld.lang
+touch ld.lang gold.lang
 %find_lang ld
-%ifarch %{ix86} %{x8664}
+%if %{with gold}
 %find_lang gold
-%else
-:> gold.lang
 %endif
 %find_lang opcodes
 cat bfd.lang opcodes.lang > %{name}-libs.lang
@@ -293,6 +296,7 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README
+%{?with_gold:%doc gold/{ChangeLog,README,TODO}}
 %attr(755,root,root) %{_bindir}/addr2line
 %attr(755,root,root) %{_bindir}/ar
 %attr(755,root,root) %{_bindir}/as
@@ -301,7 +305,7 @@
 %attr(755,root,root) %{_bindir}/gprof
 %attr(755,root,root) %{_bindir}/ld
 %attr(755,root,root) %{_bindir}/ld.bfd
-%ifarch %{ix86} %{x8664}
+%if %{with gold}
 %attr(755,root,root) %{_bindir}/ld.gold
 %endif
 %attr(755,root,root) %{_bindir}/nm
@@ -365,6 +369,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.371  2012/06/25 06:49:56  glen
+- restore gold bcond from r1.333
+
 Revision 1.370  2012/06/14 20:40:47  pluto
 - one more fix for sanity patch (add missed #include for size_t decl), release 4.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/binutils/binutils.spec?r1=1.370&r2=1.371