rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 234223 from home:Andreas_Schwab:Factory

Browse Source 
- add non-elision-enabled libpthread

OBS-URL: https://build.opensuse.org/request/show/234223
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=366
This commit is contained in:
Andreas Schwab 2014-05-15 16:27:45 +00:00 committed by Git OBS Bridge
parent c0c9ae0337
commit b640147c97
6 changed files with 105 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc-testsuite.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
- add non-elision-enabled libpthread
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 12 13:22:40 UTC 2014 - schwab@suse.de Mon May 12 13:22:40 UTC 2014 - schwab@suse.de

47
glibc-testsuite.spec
View File

@ -626,17 +626,21 @@ configure_and_build_glibc() {
profile="--enable-profile" profile="--enable-profile"
fi fi
%endif %endif
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \ elision=--enable-lock-elision
CC="$BuildCC" CXX="$BuildCCplus" ../configure \ if [ "$dirname" = "noelision" ]; then
elision=--disable-lock-elision
fi
../configure \
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
CC="$BuildCC" CXX="$BuildCCplus" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libexecdir=%{_libexecdir} --infodir=%{_infodir} \ --libexecdir=%{_libexecdir} --infodir=%{_infodir} \
--enable-add-ons=nptl$addons \ --enable-add-ons=nptl$addons \
$profile \ $profile $elision \
"$@" \ "$@" \
%if %{enable_stackguard_randomization} %if %{enable_stackguard_randomization}
--enable-stackguard-randomization \ --enable-stackguard-randomization \
%endif %endif
--enable-lock-elision \
--build=%{target} --host=%{target} \ --build=%{target} --host=%{target} \
%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
--enable-multi-arch \ --enable-multi-arch \
@ -698,6 +702,10 @@ configure_and_build_glibc() {
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
%endif
# #
# Build html documentation # Build html documentation
# #
@ -799,10 +807,9 @@ do
else else
cp -a ${lib}.so $destdir/$libbaseso cp -a ${lib}.so $destdir/$libbaseso
fi fi
# Emulate ldconfig
ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cd .. cd ..
cc-base/elf/ldconfig -vn $destdir
} }
# Install power-optimized glibc # Install power-optimized glibc
@ -817,7 +824,7 @@ cd ..
install_optimized_variant power7 power7 ".." install_optimized_variant power7 power7 ".."
%endif %endif
%if %{powerpc_optimize_cpu_cell} %if %{powerpc_optimize_cpu_cell}
install_optimized_variant ppc-cell-be ppc-cell-be ".." install_optimized_variant ppc-cell-be ppc-cell-be ".."
%endif %endif
%if %{powerpc_optimize_cpu_power6} %if %{powerpc_optimize_cpu_power6}
# power6 is compatible with power6x # power6 is compatible with power6x
@ -825,17 +832,23 @@ cd ..
if test -d %{buildroot}/%{_lib}/power6; then if test -d %{buildroot}/%{_lib}/power6; then
mkdir -p %{buildroot}/%{_lib}/power6x mkdir -p %{buildroot}/%{_lib}/power6x
for i in %{buildroot}/%{_lib}/power6/*.so; do for i in %{buildroot}/%{_lib}/power6/*.so; do
b=`basename $i` b=$(basename $i)
ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
libbase=${b%.so}
libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
# Emulate ldconfig
ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
fi fi
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
cd cc-noelision
destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
mkdir -p $destdir
install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
cd ..
cc-base/elf/ldconfig -vn $destdir
%endif
# Install locales # Install locales
%if %{build_locales} %if %{build_locales}
# XXX Do not install locales in parallel! # XXX Do not install locales in parallel!
@ -1184,6 +1197,9 @@ exit 0
%{optimized_libs ppc-cell-be} %{optimized_libs ppc-cell-be}
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
/%{_lib}/noelision
%endif
%dir %attr(0700,root,root) /var/cache/ldconfig %dir %attr(0700,root,root) /var/cache/ldconfig
/sbin/ldconfig /sbin/ldconfig
%{_bindir}/gencat %{_bindir}/gencat
@ -1204,10 +1220,7 @@ exit 0
%ifarch i586 %ifarch i586
%files obsolete %files obsolete
%defattr (755,root,root,755) %defattr (755,root,root,755)
%dir /%{_lib}/obsolete/ /%{_lib}/obsolete
%dir /%{_lib}/obsolete/noversion
/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
/%{_lib}/obsolete/noversion/libNoVersion.so.1
%endif %endif
%files locale -f libc.lang %files locale -f libc.lang

5
glibc-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
- add non-elision-enabled libpthread
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 12 13:22:40 UTC 2014 - schwab@suse.de Mon May 12 13:22:40 UTC 2014 - schwab@suse.de

47
glibc-utils.spec
View File

@ -626,17 +626,21 @@ configure_and_build_glibc() {
profile="--enable-profile" profile="--enable-profile"
fi fi
%endif %endif
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \ elision=--enable-lock-elision
CC="$BuildCC" CXX="$BuildCCplus" ../configure \ if [ "$dirname" = "noelision" ]; then
elision=--disable-lock-elision
fi
../configure \
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
CC="$BuildCC" CXX="$BuildCCplus" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libexecdir=%{_libexecdir} --infodir=%{_infodir} \ --libexecdir=%{_libexecdir} --infodir=%{_infodir} \
--enable-add-ons=nptl$addons \ --enable-add-ons=nptl$addons \
$profile \ $profile $elision \
"$@" \ "$@" \
%if %{enable_stackguard_randomization} %if %{enable_stackguard_randomization}
--enable-stackguard-randomization \ --enable-stackguard-randomization \
%endif %endif
--enable-lock-elision \
--build=%{target} --host=%{target} \ --build=%{target} --host=%{target} \
%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
--enable-multi-arch \ --enable-multi-arch \
@ -698,6 +702,10 @@ configure_and_build_glibc() {
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
%endif
# #
# Build html documentation # Build html documentation
# #
@ -799,10 +807,9 @@ do
else else
cp -a ${lib}.so $destdir/$libbaseso cp -a ${lib}.so $destdir/$libbaseso
fi fi
# Emulate ldconfig
ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cd .. cd ..
cc-base/elf/ldconfig -vn $destdir
} }
# Install power-optimized glibc # Install power-optimized glibc
@ -817,7 +824,7 @@ cd ..
install_optimized_variant power7 power7 ".." install_optimized_variant power7 power7 ".."
%endif %endif
%if %{powerpc_optimize_cpu_cell} %if %{powerpc_optimize_cpu_cell}
install_optimized_variant ppc-cell-be ppc-cell-be ".." install_optimized_variant ppc-cell-be ppc-cell-be ".."
%endif %endif
%if %{powerpc_optimize_cpu_power6} %if %{powerpc_optimize_cpu_power6}
# power6 is compatible with power6x # power6 is compatible with power6x
@ -825,17 +832,23 @@ cd ..
if test -d %{buildroot}/%{_lib}/power6; then if test -d %{buildroot}/%{_lib}/power6; then
mkdir -p %{buildroot}/%{_lib}/power6x mkdir -p %{buildroot}/%{_lib}/power6x
for i in %{buildroot}/%{_lib}/power6/*.so; do for i in %{buildroot}/%{_lib}/power6/*.so; do
b=`basename $i` b=$(basename $i)
ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
libbase=${b%.so}
libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
# Emulate ldconfig
ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
fi fi
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
cd cc-noelision
destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
mkdir -p $destdir
install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
cd ..
cc-base/elf/ldconfig -vn $destdir
%endif
# Install locales # Install locales
%if %{build_locales} %if %{build_locales}
# XXX Do not install locales in parallel! # XXX Do not install locales in parallel!
@ -1184,6 +1197,9 @@ exit 0
%{optimized_libs ppc-cell-be} %{optimized_libs ppc-cell-be}
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
/%{_lib}/noelision
%endif
%dir %attr(0700,root,root) /var/cache/ldconfig %dir %attr(0700,root,root) /var/cache/ldconfig
/sbin/ldconfig /sbin/ldconfig
%{_bindir}/gencat %{_bindir}/gencat
@ -1204,10 +1220,7 @@ exit 0
%ifarch i586 %ifarch i586
%files obsolete %files obsolete
%defattr (755,root,root,755) %defattr (755,root,root,755)
%dir /%{_lib}/obsolete/ /%{_lib}/obsolete
%dir /%{_lib}/obsolete/noversion
/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
/%{_lib}/obsolete/noversion/libNoVersion.so.1
%endif %endif
%files locale -f libc.lang %files locale -f libc.lang

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 15 15:45:03 UTC 2014 - schwab@suse.de
- add non-elision-enabled libpthread
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 12 13:22:40 UTC 2014 - schwab@suse.de Mon May 12 13:22:40 UTC 2014 - schwab@suse.de

47
glibc.spec
View File

@ -626,17 +626,21 @@ configure_and_build_glibc() {
profile="--enable-profile" profile="--enable-profile"
fi fi
%endif %endif
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \ elision=--enable-lock-elision
CC="$BuildCC" CXX="$BuildCCplus" ../configure \ if [ "$dirname" = "noelision" ]; then
elision=--disable-lock-elision
fi
../configure \
CFLAGS="$conf_cflags" BUILD_CFLAGS="$conf_cflags" \
CC="$BuildCC" CXX="$BuildCCplus" \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libexecdir=%{_libexecdir} --infodir=%{_infodir} \ --libexecdir=%{_libexecdir} --infodir=%{_infodir} \
--enable-add-ons=nptl$addons \ --enable-add-ons=nptl$addons \
$profile \ $profile $elision \
"$@" \ "$@" \
%if %{enable_stackguard_randomization} %if %{enable_stackguard_randomization}
--enable-stackguard-randomization \ --enable-stackguard-randomization \
%endif %endif
--enable-lock-elision \
--build=%{target} --host=%{target} \ --build=%{target} --host=%{target} \
%ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x %ifarch armv7hl ppc ppc64 ppc64le %{ix86} x86_64 sparc sparc64 s390 s390x
--enable-multi-arch \ --enable-multi-arch \
@ -698,6 +702,10 @@ configure_and_build_glibc() {
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
configure_and_build_glibc noelision "$BuildFlags" "$add_ons"
%endif
# #
# Build html documentation # Build html documentation
# #
@ -799,10 +807,9 @@ do
else else
cp -a ${lib}.so $destdir/$libbaseso cp -a ${lib}.so $destdir/$libbaseso
fi fi
# Emulate ldconfig
ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cd .. cd ..
cc-base/elf/ldconfig -vn $destdir
} }
# Install power-optimized glibc # Install power-optimized glibc
@ -817,7 +824,7 @@ cd ..
install_optimized_variant power7 power7 ".." install_optimized_variant power7 power7 ".."
%endif %endif
%if %{powerpc_optimize_cpu_cell} %if %{powerpc_optimize_cpu_cell}
install_optimized_variant ppc-cell-be ppc-cell-be ".." install_optimized_variant ppc-cell-be ppc-cell-be ".."
%endif %endif
%if %{powerpc_optimize_cpu_power6} %if %{powerpc_optimize_cpu_power6}
# power6 is compatible with power6x # power6 is compatible with power6x
@ -825,17 +832,23 @@ cd ..
if test -d %{buildroot}/%{_lib}/power6; then if test -d %{buildroot}/%{_lib}/power6; then
mkdir -p %{buildroot}/%{_lib}/power6x mkdir -p %{buildroot}/%{_lib}/power6x
for i in %{buildroot}/%{_lib}/power6/*.so; do for i in %{buildroot}/%{_lib}/power6/*.so; do
b=`basename $i` b=$(basename $i)
ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b ln -vs ../power6/$b %{buildroot}/%{_lib}/power6x/$b
libbase=${b%.so}
libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
# Emulate ldconfig
ln -sf $libbaseso %{buildroot}/%{_lib}/power6x/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
done done
cc-base/elf/ldconfig -vn %{buildroot}/%{_lib}/power6x
fi fi
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
cd cc-noelision
destdir=$RPM_BUILD_ROOT/%{_lib}/noelision
mkdir -p $destdir
install -m 755 nptl/libpthread.so $destdir/libpthread-%{glibc_major_version}.so
cd ..
cc-base/elf/ldconfig -vn $destdir
%endif
# Install locales # Install locales
%if %{build_locales} %if %{build_locales}
# XXX Do not install locales in parallel! # XXX Do not install locales in parallel!
@ -1184,6 +1197,9 @@ exit 0
%{optimized_libs ppc-cell-be} %{optimized_libs ppc-cell-be}
%endif %endif
%endif # optimize_power %endif # optimize_power
%ifarch i686 x86_64
/%{_lib}/noelision
%endif
%dir %attr(0700,root,root) /var/cache/ldconfig %dir %attr(0700,root,root) /var/cache/ldconfig
/sbin/ldconfig /sbin/ldconfig
%{_bindir}/gencat %{_bindir}/gencat
@ -1204,10 +1220,7 @@ exit 0
%ifarch i586 %ifarch i586
%files obsolete %files obsolete
%defattr (755,root,root,755) %defattr (755,root,root,755)
%dir /%{_lib}/obsolete/ /%{_lib}/obsolete
%dir /%{_lib}/obsolete/noversion
/%{_lib}/obsolete/noversion/libNoVersion-%{glibc_major_version}.so
/%{_lib}/obsolete/noversion/libNoVersion.so.1
%endif %endif
%files locale -f libc.lang %files locale -f libc.lang