From 6622a3046a1bc94add0dba0d18529babb9d30026 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Tue, 29 Jan 2013 11:12:24 -0800 Subject: [PATCH] gold has higher prio --- packaging/binutils.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packaging/binutils.spec b/packaging/binutils.spec index 04ac57d..6514029 100644 --- a/packaging/binutils.spec +++ b/packaging/binutils.spec @@ -246,8 +246,9 @@ rm -rf $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin ln -sf ../../bin/{ar,as,ld,nm,ranlib,strip} $RPM_BUILD_ROOT%{_prefix}/%{HOST}/bin -#mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} -#ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts +mv $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts $RPM_BUILD_ROOT%{_libdir} +ln -sf ../../%{_lib}/ldscripts $RPM_BUILD_ROOT%{_prefix}/%{HOST}/lib/ldscripts + # Install header files make -C libiberty install_to_libdir target_header_dir=/usr/include DESTDIR=$RPM_BUILD_ROOT # We want the PIC libiberty.a @@ -301,11 +302,11 @@ cd $RPM_BUILD_DIR/binutils-%version %docs_package %post "%_sbindir/update-alternatives" --install \ - "%_bindir/ld" ld "%_bindir/ld.bfd" 2 + "%_bindir/ld" ld "%_bindir/ld.bfd" 1 %post gold "%_sbindir/update-alternatives" --install \ - "%_bindir/ld" ld "%_bindir/ld.gold" 1 + "%_bindir/ld" ld "%_bindir/ld.gold" 2 %preun @@ -327,7 +328,7 @@ fi; %{_prefix}/%{HOST}/bin/* %{_prefix}/%{HOST}/lib/ldscripts %ghost %_sysconfdir/alternatives/ld -#%{_libdir}/ldscripts +%{_libdir}/ldscripts %{_bindir}/* %ifarch %gold_archs %exclude %{_bindir}/gold -- 2.7.4