rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Reorder middle-phase install steps.

Browse Source 
Testing showed that unstripped libbsd.a was missing from the list
of common debuginfo files. The fix is to move the "Misc" phase
to before the phase that adds files to the debuginfo. This way
the debuginfo files are computed after all files are in place.
This commit is contained in:
Carlos O'Donell 2013-07-26 01:05:12 -04:00
parent 70cc4d3cc2
commit 3bc8fa746f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glibc.spec
View File

@ -909,19 +909,6 @@ truncate -s 0 $RPM_BUILD_ROOT/etc/gai.conf
truncate -s 0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache truncate -s 0 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
##############################################################################
# Install debug copies of unstripped static libraries
##############################################################################
# If we are building a debug package then copy all of the static archives
# into the debug directory to keep them as unstripped copies.
%if 0%{?_enable_debug_packages}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}
cp -a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.a \
$RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
%endif
############################################################################## ##############################################################################
# Misc... # Misc...
############################################################################## ##############################################################################
@ -945,6 +932,21 @@ strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
# XXX: Ugly hack for buggy rpm. What bug? BZ? Is this fixed? # XXX: Ugly hack for buggy rpm. What bug? BZ? Is this fixed?
ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}} ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
##############################################################################
# Install debug copies of unstripped static libraries
# - This step must be last in order to capture any additional static
# archives we might have added.
##############################################################################
# If we are building a debug package then copy all of the static archives
# into the debug directory to keep them as unstripped copies.
%if 0%{?_enable_debug_packages}
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}
cp -a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.a \
$RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/
rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
%endif
############################################################################## ##############################################################################
# Build the file lists used for describing the package and subpackages. # Build the file lists used for describing the package and subpackages.
############################################################################## ##############################################################################