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

Reindent functions and multi-line commands.

Browse Source
This commit is contained in:
Carlos O'Donell 2013-07-25 18:53:13 -04:00
parent 37714d015a
commit d4d7effa6b
1 changed files with 66 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
glibc.spec
View File

@ -626,16 +626,16 @@ AddOns=,rtkaio$AddOns
############################################################################## ##############################################################################
build() build()
{ {
builddir=build-%{target}${1:+-$1} builddir=build-%{target}${1:+-$1}
${1+shift} ${1+shift}
rm -rf $builddir rm -rf $builddir
mkdir $builddir mkdir $builddir
pushd $builddir pushd $builddir
build_CFLAGS="$BuildFlags -g -O3 $*" build_CFLAGS="$BuildFlags -g -O3 $*"
# Some configure checks can spuriously fail for some architectures if # Some configure checks can spuriously fail for some architectures if
# unwind info is present # unwind info is present
configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables" configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \ ../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--enable-add-ons=ports,nptl$AddOns \ --enable-add-ons=ports,nptl$AddOns \
--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \ --with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
@ -652,10 +652,10 @@ configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
%endif %endif
--enable-lock-elision \ --enable-lock-elision \
--disable-profile --enable-nss-crypt || --disable-profile --enable-nss-crypt ||
{ cat config.log; false; } { cat config.log; false; }
make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules} make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" %{silentrules}
popd popd
} }
############################################################################## ##############################################################################
@ -679,8 +679,8 @@ build nosegneg -mno-tls-direct-seg-refs
############################################################################## ##############################################################################
%if %{buildpower6} %if %{buildpower6}
( (
platform=`LD_SHOW_AUXV=1 /bin/true | sed -n 's/^AT_PLATFORM:[[:blank:]]*//p'` platform=`LD_SHOW_AUXV=1 /bin/true | sed -n 's/^AT_PLATFORM:[[:blank:]]*//p'`
if [ "$platform" != power6 ]; then if [ "$platform" != power6 ]; then
mkdir -p power6emul/{lib,lib64} mkdir -p power6emul/{lib,lib64}
$GCC -shared -O2 -fpic -o power6emul/%{_lib}/power6emul.so releng/power6emul.c -Wl,-z,initfirst $GCC -shared -O2 -fpic -o power6emul/%{_lib}/power6emul.so releng/power6emul.c -Wl,-z,initfirst
%ifarch ppc %ifarch ppc
@ -690,11 +690,11 @@ if [ "$platform" != power6 ]; then
gcc -shared -nostdlib -O2 -fpic -m32 -o power6emul/lib/power6emul.so -xc - < /dev/null gcc -shared -nostdlib -O2 -fpic -m32 -o power6emul/lib/power6emul.so -xc - < /dev/null
%endif %endif
export LD_PRELOAD=`pwd`/power6emul/\$LIB/power6emul.so export LD_PRELOAD=`pwd`/power6emul/\$LIB/power6emul.so
fi fi
AddOns="$AddOns --with-cpu=power6" AddOns="$AddOns --with-cpu=power6"
GCC="$GCC -mcpu=power6" GCC="$GCC -mcpu=power6"
GXX="$GXX -mcpu=power6" GXX="$GXX -mcpu=power6"
build power6 build power6
) )
%endif %endif
@ -722,13 +722,15 @@ GCC=`cat Gcc`
# Cleanup any previous installs... # Cleanup any previous installs...
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT
make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} %{silentrules} make -j1 install_root=$RPM_BUILD_ROOT \
install -C build-%{target} %{silentrules}
chmod +x $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown chmod +x $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown
# If we are not building an auxiliary arch then install all of the supported # If we are not building an auxiliary arch then install all of the supported
# locales. # locales.
%ifnarch %{auxarches} %ifnarch %{auxarches}
pushd build-%{target} pushd build-%{target}
make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT \
install-locales -C ../localedata objdir=`pwd`
popd popd
%endif %endif
@ -1257,13 +1259,19 @@ find_debuginfo_args='--strict-build-id -g'
%ifarch %{debuginfocommonarches} %ifarch %{debuginfocommonarches}
echo %{_prefix}/libexec/pt_chown > workaround.filelist echo %{_prefix}/libexec/pt_chown > workaround.filelist
find_debuginfo_args="$find_debuginfo_args \ find_debuginfo_args="$find_debuginfo_args \
-l common.filelist -l utils.filelist -l nscd.filelist -l workaround.filelist \ -l common.filelist \
-l utils.filelist \
-l nscd.filelist \
-l workaround.filelist \
-p '.*/(sbin|libexec)/.*' \ -p '.*/(sbin|libexec)/.*' \
-o debuginfocommon.filelist \ -o debuginfocommon.filelist \
-l rpm.filelist -l nosegneg.filelist \ -l rpm.filelist \
-l nosegneg.filelist \
" "
%endif %endif
eval /usr/lib/rpm/find-debuginfo.sh "$find_debuginfo_args" -o debuginfo.filelist eval /usr/lib/rpm/find-debuginfo.sh \
"$find_debuginfo_args" \
-o debuginfo.filelist
# List all of the *.a archives in the debug directory. # List all of the *.a archives in the debug directory.
list_debug_archives() list_debug_archives()