Second round of whitespace and indentation fixes.
This commit is contained in:
parent
d4d7effa6b
commit
2eb150368a
16
glibc.spec
16
glibc.spec
@ -696,7 +696,7 @@ build nosegneg -mno-tls-direct-seg-refs
|
|||||||
GXX="$GXX -mcpu=power6"
|
GXX="$GXX -mcpu=power6"
|
||||||
build power6
|
build power6
|
||||||
)
|
)
|
||||||
%endif
|
%endif # %{buildpower6}
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Build the glibc post-upgrade program:
|
# Build the glibc post-upgrade program:
|
||||||
@ -705,7 +705,8 @@ build nosegneg -mno-tls-direct-seg-refs
|
|||||||
# we only build it once.
|
# we only build it once.
|
||||||
##############################################################################
|
##############################################################################
|
||||||
pushd build-%{target}
|
pushd build-%{target}
|
||||||
$GCC -static -L. -Os -g ../releng/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
|
$GCC -static -L. -Os -g ../releng/glibc_post_upgrade.c \
|
||||||
|
-o glibc_post_upgrade.%{_target_cpu} \
|
||||||
'-DLIBTLS="/%{_lib}/tls/"' \
|
'-DLIBTLS="/%{_lib}/tls/"' \
|
||||||
'-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
|
'-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
|
||||||
'-DLD_SO_CONF="/etc/ld.so.conf"' \
|
'-DLD_SO_CONF="/etc/ld.so.conf"' \
|
||||||
@ -783,7 +784,7 @@ fi
|
|||||||
ln -sf $librtkaioso $destdir/$librtso
|
ln -sf $librtkaioso $destdir/$librtso
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif # %{buildxen}
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Install the power6 build files.
|
# Install the power6 build files.
|
||||||
@ -817,7 +818,7 @@ cp -a ../power6/*.so.* .
|
|||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif # %{buildpower6}
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Remove the files we don't want to distribute
|
# Remove the files we don't want to distribute
|
||||||
@ -1253,7 +1254,8 @@ popd
|
|||||||
# XXX: Why do we do this?
|
# XXX: Why do we do this?
|
||||||
ls -l $RPM_BUILD_ROOT/usr/bin/getconf
|
ls -l $RPM_BUILD_ROOT/usr/bin/getconf
|
||||||
ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
|
ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
|
||||||
eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf $RPM_BUILD_ROOT/usr/libexec/getconf/*
|
eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf \
|
||||||
|
$RPM_BUILD_ROOT/usr/libexec/getconf/*
|
||||||
|
|
||||||
find_debuginfo_args='--strict-build-id -g'
|
find_debuginfo_args='--strict-build-id -g'
|
||||||
%ifarch %{debuginfocommonarches}
|
%ifarch %{debuginfocommonarches}
|
||||||
@ -1266,8 +1268,7 @@ find_debuginfo_args="$find_debuginfo_args \
|
|||||||
-p '.*/(sbin|libexec)/.*' \
|
-p '.*/(sbin|libexec)/.*' \
|
||||||
-o debuginfocommon.filelist \
|
-o debuginfocommon.filelist \
|
||||||
-l rpm.filelist \
|
-l rpm.filelist \
|
||||||
-l nosegneg.filelist \
|
-l nosegneg.filelist"
|
||||||
"
|
|
||||||
%endif
|
%endif
|
||||||
eval /usr/lib/rpm/find-debuginfo.sh \
|
eval /usr/lib/rpm/find-debuginfo.sh \
|
||||||
"$find_debuginfo_args" \
|
"$find_debuginfo_args" \
|
||||||
@ -1347,6 +1348,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown
|
|||||||
mkdir -p $RPM_BUILD_ROOT/var/{db,run}/nscd
|
mkdir -p $RPM_BUILD_ROOT/var/{db,run}/nscd
|
||||||
touch $RPM_BUILD_ROOT/var/{db,run}/nscd/{passwd,group,hosts,services}
|
touch $RPM_BUILD_ROOT/var/{db,run}/nscd/{passwd,group,hosts,services}
|
||||||
touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
|
touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
|
||||||
|
|
||||||
%endif # %{auxarches}
|
%endif # %{auxarches}
|
||||||
|
|
||||||
%ifnarch %{auxarches}
|
%ifnarch %{auxarches}
|
||||||
|
Loading…
Reference in New Issue
Block a user