SHA256
1
0
forked from pool/glibc

Accepting request 59369 from Base:System

Accepted submit request 59369 from user rguenther

OBS-URL: https://build.opensuse.org/request/show/59369
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=34
This commit is contained in:
Marcus Rückert 2011-01-28 15:56:03 +00:00 committed by Git OBS Bridge
commit d1babbf946
4 changed files with 28 additions and 5 deletions

View File

@ -0,0 +1,11 @@
--- sysdeps/unix/sysv/linux/mkdirat.c.orig 2011-01-28 15:50:00.000000000 +0100
+++ sysdeps/unix/sysv/linux/mkdirat.c 2011-01-28 15:51:42.000000000 +0100
@@ -43,7 +43,7 @@
{
res = INLINE_SYSCALL (mkdirat, 3, fd, file, mode);
# ifndef __ASSUME_ATFCTS
- if (res == -1 && res == ENOSYS)
+ if (res == -1 && errno == ENOSYS)
__have_atfcts = -1;
else
# endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 28 14:53:35 UTC 2011 - rguenther@novell.com
- Fix ENOSYS detection for mkdirat. [bso#12397]
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 9 12:33:35 UTC 2010 - rguenther@novell.com Thu Dec 9 12:33:35 UTC 2010 - rguenther@novell.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package glibc (Version 2.11.3) # spec file for package glibc (Version 2.11.3)
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -64,7 +64,7 @@ Obsoletes: glibc-32bit
Provides: rtld(GNU_HASH) Provides: rtld(GNU_HASH)
AutoReqProv: on AutoReqProv: on
Version: 2.11.3 Version: 2.11.3
Release: 2 Release: 3
Url: http://www.gnu.org/software/libc/libc.html Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem PreReq: filesystem
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -141,7 +141,8 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff
Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155 # http://sources.redhat.com/bugzilla/show_bug.cgi?id=11155
Patch600: glibc-sparc64-fxstat.diff Patch600: glibc-sparc64-fxstat.diff
Patch601: glibc-2.11.3-bnc658509.diff Patch601: glibc-2.11.3-bnc658509.diff
Patch602: glibc-2.11.3-bso12397.diff
%description %description
The GNU C Library provides the most important standard libraries used The GNU C Library provides the most important standard libraries used
@ -364,6 +365,7 @@ rm nscd/s-stamp
%endif %endif
%patch600 -p1 %patch600 -p1
%patch601 %patch601
%patch602
# #
# Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
# #
@ -384,12 +386,12 @@ rm nscd/s-stamp
rm -fv sysdeps/powerpc/powerpc32/power4/hp-timing.c sysdeps/powerpc/powerpc32/power4/hp-timing.h rm -fv sysdeps/powerpc/powerpc32/power4/hp-timing.c sysdeps/powerpc/powerpc32/power4/hp-timing.h
find . -name configure | xargs touch find . -name configure | xargs touch
####################################################################### #######################################################################
### ###
### BUILD ### BUILD
### ###
####################################################################### #######################################################################
%build %build
if [ -x /bin/uname.bin ]; then if [ -x /bin/uname.bin ]; then
/bin/uname.bin -a /bin/uname.bin -a
@ -554,6 +556,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
%endif %endif
'-DLIBDIR="/%{_lib}"' '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' '-DLIBDIR="/%{_lib}"' '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"'
####################################################################### #######################################################################
### ###
### CHECK ### CHECK
@ -576,6 +579,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
%endif %endif
make -C cc-base check-abi || echo check-abi failed make -C cc-base check-abi || echo check-abi failed
####################################################################### #######################################################################
### ###
### INSTALL ### INSTALL
@ -668,6 +672,7 @@ cp -av bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
ln -sf ../%{_lib}/ld-%{version}.so $RPM_BUILD_ROOT/lib/ld64.so.1 ln -sf ../%{_lib}/ld-%{version}.so $RPM_BUILD_ROOT/lib/ld64.so.1
%endif %endif
# Miscelanna: # Miscelanna:
install -m 0700 glibc_post_upgrade $RPM_BUILD_ROOT%{_sbindir} install -m 0700 glibc_post_upgrade $RPM_BUILD_ROOT%{_sbindir}
@ -688,6 +693,7 @@ cp -p manual/libc/*.html $RPM_BUILD_ROOT/usr/share/doc/glibc
cd manpages; make install_root=$RPM_BUILD_ROOT install; cd .. cd manpages; make install_root=$RPM_BUILD_ROOT install; cd ..
# nscd tools: # nscd tools:
cp nscd/nscd.conf $RPM_BUILD_ROOT/etc cp nscd/nscd.conf $RPM_BUILD_ROOT/etc
@ -761,6 +767,7 @@ for o in $RPM_BUILD_ROOT/%{_libdir}/crt[1in].o $RPM_BUILD_ROOT/%{_libdir}/lib*_n
objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
done done
####################################################################### #######################################################################
### ###
### ... ### ...
@ -798,6 +805,7 @@ done
%insserv_cleanup %insserv_cleanup
exit 0 exit 0
####################################################################### #######################################################################
### ###
### FILES ### FILES
@ -805,7 +813,6 @@ exit 0
####################################################################### #######################################################################
# glibc # glibc
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSES %doc LICENSES

0
ready Normal file
View File