rpms/binutils
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Use make_build and make_install macros.

Browse Source 
Resolves: #1541027
This commit is contained in:
Nick Clifton 2018-02-01 16:35:33 +00:00
parent 6093f83bd6
commit ededaea4f3
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
STAGE1-binutils
View File

@ -1,6 +0,0 @@
srpm binutils
mcd $BUILDDIR/binutils
$SRC/binutils-*/configure $CONFIGARGS
notparallel
make $J
make $J install

6
STAGE1-t-binutils
View File

@ -1,6 +0,0 @@
srpm binutils
mcd $BUILDDIR/t-binutils
$SRC/binutils-*/configure $TCONFIGARGS
notparallel
make $J
make $J install DESTDIR=${ROOTFS}

27
binutils.spec
View File

@ -68,7 +68,7 @@
Summary: A GNU collection of binary utilities Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug} Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.29.1 Version: 2.29.1
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv3+ License: GPLv3+
Group: Development/Tools Group: Development/Tools
URL: https://sourceware.org/binutils URL: https://sourceware.org/binutils
@ -459,10 +459,10 @@ CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0"
--with-bugurl=http://bugzilla.redhat.com/bugzilla/ --with-bugurl=http://bugzilla.redhat.com/bugzilla/
%if %{with docs} %if %{with docs}
make %{_smp_mflags} tooldir=%{_prefix} all %make_build %{_smp_mflags} tooldir=%{_prefix} all
make %{_smp_mflags} tooldir=%{_prefix} info %make_build %{_smp_mflags} tooldir=%{_prefix} info
%else %else
make %{_smp_mflags} tooldir=%{_prefix} MAKEINFO=true all %make_build %{_smp_mflags} tooldir=%{_prefix} MAKEINFO=true all
%endif %endif
# Do not use %%check as it is run after %%install where libbfd.so is rebuild # Do not use %%check as it is run after %%install where libbfd.so is rebuild
@ -488,9 +488,9 @@ rm -f binutils-%{_target_platform}.tar.bz2 binutils-%{_target_platform}-*.{sum,l
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
%if %{with docs} %if %{with docs}
make install DESTDIR=%{buildroot} %make_install DESTDIR=%{buildroot}
%else %else
make install DESTDIR=%{buildroot} MAKEINFO=true %make_install DESTDIR=%{buildroot} MAKEINFO=true
%endif %endif
%if %{isnative} %if %{isnative}
@ -500,18 +500,18 @@ make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} install-info
# Rebuild libiberty.a with -fPIC. # Rebuild libiberty.a with -fPIC.
# Future: Remove it together with its header file, projects should bundle it. # Future: Remove it together with its header file, projects should bundle it.
make -C libiberty clean %make_build -C libiberty clean
make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty %make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C libiberty
# Rebuild libbfd.a with -fPIC. # Rebuild libbfd.a with -fPIC.
# Without the hidden visibility the 3rd party shared libraries would export # Without the hidden visibility the 3rd party shared libraries would export
# the bfd non-stable ABI. # the bfd non-stable ABI.
make -C bfd clean %make_build -C bfd clean
make CFLAGS="-g -fPIC $RPM_OPT_FLAGS -fvisibility=hidden" -C bfd %make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS -fvisibility=hidden" -C bfd
# Rebuild libopcodes.a with -fPIC. # Rebuild libopcodes.a with -fPIC.
make -C opcodes clean %make_build -C opcodes clean
make CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C opcodes %make_build CFLAGS="-g -fPIC $RPM_OPT_FLAGS" -C opcodes
install -m 644 bfd/libbfd.a %{buildroot}%{_libdir} install -m 644 bfd/libbfd.a %{buildroot}%{_libdir}
install -m 644 libiberty/libiberty.a %{buildroot}%{_libdir} install -m 644 libiberty/libiberty.a %{buildroot}%{_libdir}
@ -730,6 +730,9 @@ exit 0
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%changelog %changelog
* Thu Feb 01 2018 Nick Clifton <nickc@redhat.com> 2.29.1-16
- Use make_build and make_install macros. (#1541027)
* Thu Jan 25 2018 Nick Clifton <nickc@redhat.com> 2.29.1-15 * Thu Jan 25 2018 Nick Clifton <nickc@redhat.com> 2.29.1-15
- Reenable binary annotations. - Reenable binary annotations.