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

Remove all linuxthreads handling from spec file.

Browse Source
This commit is contained in:
Carlos O'Donell 2015-06-21 20:17:04 -04:00
parent d599077305
commit 2542c05d11
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.21-357-gb40a4e1 %define glibcsrcdir glibc-2.21-357-gb40a4e1
%define glibcversion 2.21.90 %define glibcversion 2.21.90
%define glibcrelease 16%{?dist} %define glibcrelease 17%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -719,7 +719,7 @@ EnableKernel="--enable-kernel=%{enablekernel}"
# Save the used compiler and options into the file "Gcc" for use later # Save the used compiler and options into the file "Gcc" for use later
# by %%install. # by %%install.
echo "$GCC" > Gcc echo "$GCC" > Gcc
AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'` AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
%ifarch %{rtkaioarches} %ifarch %{rtkaioarches}
AddOns=,rtkaio$AddOns AddOns=,rtkaio$AddOns
%endif %endif
@ -1184,8 +1184,8 @@ grep '%{_prefix}/include/gnu/stubs-.*\.h$' < rpm.filelist >> devel.filelist || :
grep '%{_prefix}/include/gnu/lib-names-.*\.h$' < rpm.filelist >> devel.filelist || : grep '%{_prefix}/include/gnu/lib-names-.*\.h$' < rpm.filelist >> devel.filelist || :
# Put the include files into headers file list. # Put the include files into headers file list.
grep '%{_prefix}/include' < rpm.filelist \ grep '%{_prefix}/include' < rpm.filelist \
| egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-.*\.h$)' \ | egrep -v '%{_prefix}/include/gnu/stubs-.*\.h$' \
| egrep -v '%{_prefix}/include/(linuxthreads|gnu/lib-names-.*\.h$)' \ | egrep -v '%{_prefix}/include/gnu/lib-names-.*\.h$' \
> headers.filelist > headers.filelist
# Remove partial (lib*_p.a) static libraries, include files, and info files from # Remove partial (lib*_p.a) static libraries, include files, and info files from
@ -1209,12 +1209,11 @@ grep '%{_libdir}/lib.*\.a' < rpm.filelist \
grep '%{_libdir}/.*\.o' < rpm.filelist >> devel.filelist grep '%{_libdir}/.*\.o' < rpm.filelist >> devel.filelist
grep '%{_libdir}/lib.*\.so' < rpm.filelist >> devel.filelist grep '%{_libdir}/lib.*\.so' < rpm.filelist >> devel.filelist
# Remove all of the static, object, unversioned DSOs, old linuxthreads stuff, # Remove all of the static, object, unversioned DSOs, and nscd from the core
# and nscd from the core glibc package. # glibc package.
sed -i -e '\|%{_libdir}/lib.*\.a|d' \ sed -i -e '\|%{_libdir}/lib.*\.a|d' \
-e '\|%{_libdir}/.*\.o|d' \ -e '\|%{_libdir}/.*\.o|d' \
-e '\|%{_libdir}/lib.*\.so|d' \ -e '\|%{_libdir}/lib.*\.so|d' \
-e '\|%{_libdir}/linuxthreads|d' \
-e '\|nscd|d' rpm.filelist -e '\|nscd|d' rpm.filelist
# All of the bin and certain sbin files go into the common package. # All of the bin and certain sbin files go into the common package.
@ -1825,6 +1824,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Sun Jun 21 2015 Carlos O'Donell <carlos@redhat.com> - 2.21.90-17
- Remove all linuxthreads handling from glibc spec file.
* Wed Jun 17 2015 Carlos O'Donell <carlos@redhat.com> - 2.21.90-16 * Wed Jun 17 2015 Carlos O'Donell <carlos@redhat.com> - 2.21.90-16
- Move split out architecture-dependent header files into devel package - Move split out architecture-dependent header files into devel package
and keep generic variant in headers package, thus keeping headers package and keep generic variant in headers package, thus keeping headers package