|
|
@@ -1,7 +1,5 @@
|
|
|
-%define glibcversion 2.18
|
|
|
+%define glibcversion 2.23
|
|
|
%define glibcsrcdir glibc-%{glibcversion}
|
|
|
-#%define glibcportsdir glibc-ports-%{glibcversion}
|
|
|
-%define glibcportsdir ports
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
### glibc.spec.in follows:
|
|
|
%define run_glibc_tests 1
|
|
|
@@ -22,7 +20,6 @@
|
|
|
%else
|
|
|
%define buildpower6 0
|
|
|
%endif
|
|
|
-%define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x
|
|
|
%define biarcharches %{ix86} x86_64 ppc ppc64 s390 s390x
|
|
|
%define debuginfocommonarches %{biarcharches} alpha alphaev6
|
|
|
%define multiarcharches ppc ppc64 %{ix86} x86_64 %{sparc}
|
|
|
@@ -33,7 +30,7 @@ Summary: The GNU libc libraries
|
|
|
Summary(ja): GNU libc ライブラリ
|
|
|
Name: glibc
|
|
|
Version: %{glibcversion}
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Release: 1%{?_dist_release}
|
|
|
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
|
|
|
# Things that are linked directly into dynamically linked programs
|
|
|
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
|
|
|
@@ -52,26 +49,10 @@ Source11: find_requires_glibc.sh
|
|
|
|
|
|
|
|
|
# patches from Fedora
|
|
|
-Patch11: %{name}-2.18-nptl-linklibc.patch
|
|
|
+Patch11: %{name}-2.23-nptl-linklibc.patch
|
|
|
Patch12: %{name}-2.18-localedef.patch
|
|
|
Patch13: %{name}-2.18-locarchive.patch
|
|
|
|
|
|
-# rtkaio and c_stubs. Note that despite the numbering, these are always
|
|
|
-# applied first.
|
|
|
-Patch14: %{name}-rtkaio.patch
|
|
|
-Patch15: %{name}-c_stubs.patch
|
|
|
-
|
|
|
-# Remove non-ELF support in rtkaio
|
|
|
-Patch16: %{name}-rh731833-rtkaio.patch
|
|
|
-Patch17: %{name}-rh731833-rtkaio-2.patch
|
|
|
-Patch18: %{name}-rh970865.patch
|
|
|
-
|
|
|
-#
|
|
|
-# Patches from upstream
|
|
|
-#
|
|
|
-Patch19: %{name}-rh995841.patch
|
|
|
-
|
|
|
-
|
|
|
# patch for Vine
|
|
|
Patch10001: glibc-2.18-vine-build-env.patch
|
|
|
|
|
|
@@ -441,18 +422,11 @@ package or when debugging this package.
|
|
|
%endif
|
|
|
|
|
|
%prep
|
|
|
-rm -rf %{glibcportsdir}
|
|
|
%setup -q -n %{glibcsrcdir}
|
|
|
|
|
|
%patch11 -p1
|
|
|
%patch12 -p1
|
|
|
%patch13 -p1
|
|
|
-%patch14 -p1
|
|
|
-%patch15 -p1
|
|
|
-%patch16 -p1
|
|
|
-%patch17 -p1
|
|
|
-%patch18 -p1
|
|
|
-%patch19 -p1
|
|
|
|
|
|
%patch10001 -p1
|
|
|
|
|
|
@@ -532,9 +506,6 @@ esac
|
|
|
EnableKernel="--enable-kernel=%{enablekernel}"
|
|
|
echo "$GCC" > Gcc
|
|
|
AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
|
|
|
-%ifarch %{rtkaioarches}
|
|
|
-AddOns=,rtkaio$AddOns
|
|
|
-%endif
|
|
|
|
|
|
build()
|
|
|
{
|
|
|
@@ -543,13 +514,13 @@ ${1+shift}
|
|
|
rm -rf $builddir
|
|
|
mkdir $builddir
|
|
|
pushd $builddir
|
|
|
-build_CFLAGS="$BuildFlags -g -O3 $*"
|
|
|
+build_CFLAGS="$BuildFlags -g -O3 $* -Wno-error=unused-but-set-variable -Wno-error=unused-function"
|
|
|
# Some configure checks can spuriously fail for some architectures if
|
|
|
# unwind info is present
|
|
|
configure_CFLAGS="$build_CFLAGS -fno-asynchronous-unwind-tables"
|
|
|
../configure CC="$GCC" CXX="$GXX" CFLAGS="$configure_CFLAGS" \
|
|
|
--prefix=%{_prefix} \
|
|
|
- --enable-add-ons=%{glibcportsdir},nptl$AddOns $EnableKernel \
|
|
|
+ --enable-add-ons=$AddOns $EnableKernel \
|
|
|
--with-headers=%{_prefix}/include --enable-bind-now \
|
|
|
--build %{target} \
|
|
|
--host %{target} \
|
|
|
@@ -718,7 +689,8 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion*
|
|
|
|
|
|
# NPTL <bits/stdio-lock.h> is not usable outside of glibc, so include
|
|
|
# the generic one (#162634)
|
|
|
-cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
|
|
|
+cp -a sysdeps/generic/stdio-lock.h \
|
|
|
+ $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
|
|
|
# And <bits/libc-lock.h> needs sanitizing as well.
|
|
|
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
|
|
|
|
|
|
@@ -854,10 +826,10 @@ sed -i -e '\|%{_prefix}/%{_lib}/lib.*_p.a|d' \
|
|
|
-e '\|%{_infodir}|d' rpm.filelist
|
|
|
|
|
|
grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \
|
|
|
- | grep '/lib\(\(c\|pthread\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
|
|
|
+ | grep '/lib\(\(c\|pthread\|mvec\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
|
|
|
>> devel.filelist
|
|
|
grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \
|
|
|
- | grep -v '/lib\(\(c\|pthread\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
|
|
|
+ | grep -v '/lib\(\(c\|pthread\|mvec\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
|
|
|
> static.filelist
|
|
|
grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist
|
|
|
grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist
|
|
|
@@ -1430,6 +1402,11 @@ rm -f *.filelist*
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 07 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.23-1
|
|
|
+- update to 2.23
|
|
|
+- remove Patch14-18
|
|
|
+- update SOURCE1 from fedora
|
|
|
+
|
|
|
* Sun Dec 13 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18-3
|
|
|
- rebuild with VineSeed environment
|
|
|
|
Takemikaduchi