SHA256
6
0
forked from pool/glibc

Accepting request 202951 from home:Andreas_Schwab:Factory

- Enable ports addon for m68k and adapt file list
- m68k-Scrt1.patch: Use PIC for Scrt1.o

OBS-URL: https://build.opensuse.org/request/show/202951
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=313
This commit is contained in:
2013-10-11 10:21:14 +00:00
committed by Git OBS Bridge
parent 177143a5e4
commit f765de7465
7 changed files with 86 additions and 9 deletions

View File

@@ -246,6 +246,8 @@ Patch306: glibc-fix-double-loopback.diff
Patch1000: fcntl-o-tmpfile.patch
# PATCH-FIX-UPSTREAM Integer overflows in malloc
Patch1001: malloc-overflows.patch
# PATCH-FIX-UPSTREAM m68k: Use PIC for Scrt1.o
Patch1002: m68k-Scrt1.patch
###
# Patches awaiting upstream approval
@@ -472,6 +474,7 @@ rm nscd/s-stamp
%patch1000 -p1
%patch1001 -p1
%patch1002 -p1
# XXX Disable, it breaks the testsuite, test elf/tst-audit2
# %patch2008 -p1
@@ -585,7 +588,7 @@ add_ons=",libidn"
%ifarch %ix86
add_ons=$add_ons,noversion
%endif
%ifarch %arm aarch64 mipsel ia64
%ifarch %arm aarch64 mipsel ia64 m68k
add_ons=$add_ons,ports
%endif
%ifarch mipsel
@@ -1057,7 +1060,7 @@ exit 0
%ifarch ia64
/%{_lib}/ld-linux-ia64.so.2
%endif
%ifarch ppc s390 mips hppa
%ifarch ppc s390 mips hppa m68k
/%{_lib}/ld.so.1
%endif
%ifarch ppc64
@@ -1156,7 +1159,7 @@ exit 0
%{_bindir}/getent
%{_bindir}/iconv
%attr(755,root,root) %{_bindir}/ldd
%ifarch %ix86 sparc sparcv9
%ifarch %ix86 sparc sparcv9 m68k
%{_bindir}/lddlibc4
%endif
%{_bindir}/locale