|
|
@@ -1,6 +1,7 @@
|
|
|
-%define glibcversion 2.14.1
|
|
|
+%define glibcversion 2.18
|
|
|
%define glibcsrcdir glibc-%{glibcversion}
|
|
|
-%define glibcportsdir glibc-ports-%{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
|
|
|
@@ -32,7 +33,7 @@ Summary: The GNU libc libraries
|
|
|
Summary(ja): GNU libc ライブラリ
|
|
|
Name: glibc
|
|
|
Version: %{glibcversion}
|
|
|
-Release: 4%{?_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
|
|
|
@@ -42,24 +43,38 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
|
|
|
Group: System Environment/Libraries
|
|
|
URL: http://www.gnu.org/software/glibc/
|
|
|
Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.xz
|
|
|
-Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz
|
|
|
-Source2: %{glibcsrcdir}-fedora.tar.xz
|
|
|
+Source1: build-locale-archive.c
|
|
|
+Source2: glibc_post_upgrade.c
|
|
|
+Source3: libc-lock.h
|
|
|
+Source7: nsswitch.conf.vine
|
|
|
Source10: find_provides_glibc.sh
|
|
|
Source11: find_requires_glibc.sh
|
|
|
-Patch0: %{name}-fedora.patch
|
|
|
-Patch1: %{name}-%{version}-locarchive.patch
|
|
|
-Patch2: %{name}-%{version}-sysdep-ASFLAGS.patch
|
|
|
-Patch3: %{name}-%{version}-locales-dir.patch
|
|
|
-# Patch4: %{name}-no-leaf-attribute.patch
|
|
|
-# Patch5: %{name}-arenalock.patch
|
|
|
-# Patch6: %{name}-rh757881.patch
|
|
|
-
|
|
|
-# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873
|
|
|
-Patch10: glibc-2.14-reexport-rpc-interface.patch
|
|
|
-# http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3
|
|
|
-Patch11: glibc-2.14-reinstall-nis-rpc-headers.patch
|
|
|
-#http://sourceware.org/bugzilla/attachment.cgi?id=6024&action=diff
|
|
|
-Patch12: glibc-fix-do_lookup_x.patch
|
|
|
+
|
|
|
+
|
|
|
+# patches from Fedora
|
|
|
+Patch11: %{name}-2.18-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
|
|
|
+
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
Obsoletes: glibc-profile < 2.4
|
|
|
@@ -81,10 +96,19 @@ BuildRequires: gcc >= 3.2
|
|
|
Conflicts: kernel < %{enablekernel}
|
|
|
%define enablekernel 2.6.18
|
|
|
%ifarch i386
|
|
|
-%define nptl_target_cpu i486
|
|
|
+%define target_cpu i486
|
|
|
%else
|
|
|
-%define nptl_target_cpu %{_target_cpu}
|
|
|
+%define target_cpu %{_target_cpu}
|
|
|
+%endif
|
|
|
+
|
|
|
+%define target %{_target_cpu}-vine-linux
|
|
|
+%ifarch %{arm}
|
|
|
+%define target %{_target_cpu}-vine-linuxeabi
|
|
|
%endif
|
|
|
+%ifarch %{power64}
|
|
|
+%define target ppc64-vine-linux
|
|
|
+%endif
|
|
|
+
|
|
|
%ifarch %{multiarcharches}
|
|
|
# Need STT_IFUNC support
|
|
|
%ifarch ppc ppc64
|
|
|
@@ -109,6 +133,13 @@ BuildRequires: gcc >= 4.1.0-0.17
|
|
|
BuildRequires: elfutils >= 0.72
|
|
|
BuildRequires: rpm >= 4.2-0.56
|
|
|
%endif
|
|
|
+
|
|
|
+# The testsuite builds static C++ binaries that require a static
|
|
|
+# C++ runtime from libstdc++-static.
|
|
|
+BuildRequires: libstdc++-static
|
|
|
+
|
|
|
+BuildRequires: tzdata
|
|
|
+
|
|
|
%define __find_provides %{SOURCE10}
|
|
|
%define __find_requires %{SOURCE11}
|
|
|
%define _filter_GLIBC_PRIVATE 1
|
|
|
@@ -411,15 +442,20 @@ package or when debugging this package.
|
|
|
|
|
|
%prep
|
|
|
rm -rf %{glibcportsdir}
|
|
|
-%setup -q -n %{glibcsrcdir} -b1 -b2
|
|
|
-# %patch0 -E -p1
|
|
|
-%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
-%patch3 -p1
|
|
|
-# %patch4 -p1
|
|
|
-%patch10 -p1
|
|
|
+%setup -q -n %{glibcsrcdir}
|
|
|
+
|
|
|
%patch11 -p1
|
|
|
%patch12 -p1
|
|
|
+%patch13 -p1
|
|
|
+%patch14 -p1
|
|
|
+%patch15 -p1
|
|
|
+%patch16 -p1
|
|
|
+%patch17 -p1
|
|
|
+%patch18 -p1
|
|
|
+%patch19 -p1
|
|
|
+
|
|
|
+%patch10001 -p1
|
|
|
+
|
|
|
|
|
|
# A lot of programs still misuse memcpy when they have to use
|
|
|
# memmove. The memcpy implementation below is not tolerant at
|
|
|
@@ -440,7 +476,7 @@ touch locale/programs/*-kw.h
|
|
|
GCC=gcc
|
|
|
GXX=g++
|
|
|
%ifarch %{ix86}
|
|
|
-BuildFlags="-march=%{nptl_target_cpu} -mtune=generic"
|
|
|
+BuildFlags="-march=%{target_cpu} -mtune=generic"
|
|
|
%endif
|
|
|
%ifarch i686
|
|
|
BuildFlags="-march=i686 -mtune=generic"
|
|
|
@@ -500,37 +536,41 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai
|
|
|
AddOns=,rtkaio$AddOns
|
|
|
%endif
|
|
|
|
|
|
-build_nptl()
|
|
|
+build()
|
|
|
{
|
|
|
-builddir=build-%{nptl_target_cpu}-$1
|
|
|
-shift
|
|
|
+builddir=build-%{target}${1:+-$1}
|
|
|
+${1+shift}
|
|
|
rm -rf $builddir
|
|
|
-mkdir $builddir ; cd $builddir
|
|
|
+mkdir $builddir
|
|
|
+pushd $builddir
|
|
|
build_CFLAGS="$BuildFlags -g -O3 $*"
|
|
|
# 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=%{glibcportsdir},nptl$AddOns $EnableKernel \
|
|
|
--with-headers=%{_prefix}/include --enable-bind-now \
|
|
|
- --build %{nptl_target_cpu}-vine-linux \
|
|
|
- --host %{nptl_target_cpu}-vine-linux \
|
|
|
+ --build %{target} \
|
|
|
+ --host %{target} \
|
|
|
+ --enable-pt_chown \
|
|
|
%ifarch %{multiarcharches}
|
|
|
--enable-multi-arch \
|
|
|
%endif
|
|
|
+ --enable-obsolete-rpc \
|
|
|
+ --enable-lock-elision \
|
|
|
--disable-profile --enable-nss-crypt ||
|
|
|
{ cat config.log; false; }
|
|
|
|
|
|
make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
|
|
|
|
|
|
-cd ..
|
|
|
+popd
|
|
|
}
|
|
|
|
|
|
-build_nptl linuxnptl
|
|
|
+build
|
|
|
|
|
|
%if %{buildxen}
|
|
|
-build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs
|
|
|
+build nosegneg -mno-tls-direct-seg-refs
|
|
|
%endif
|
|
|
|
|
|
%if %{buildpower6}
|
|
|
@@ -550,28 +590,28 @@ fi
|
|
|
AddOns="$AddOns --with-cpu=power6"
|
|
|
GCC="$GCC -mcpu=power6"
|
|
|
GXX="$GXX -mcpu=power6"
|
|
|
-build_nptl linuxnptl-power6
|
|
|
+build power6
|
|
|
)
|
|
|
%endif
|
|
|
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl
|
|
|
-$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
|
|
|
- -DNO_SIZE_OPTIMIZATION \
|
|
|
- '-DLIBTLS="/%{_lib}/tls/"' \
|
|
|
- '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
|
|
|
- '-DLD_SO_CONF="/etc/ld.so.conf"' \
|
|
|
- '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
|
|
|
-cd ..
|
|
|
+pushd build-%{target}
|
|
|
+$GCC -static -L. -Os -g %{SOURCE2} \
|
|
|
+ -o glibc_post_upgrade.%{_target_cpu} \
|
|
|
+ '-DLIBTLS="/%{_lib}/tls/"' \
|
|
|
+ '-DGCONV_MODULES_DIR="%{_libdir}/gconv"' \
|
|
|
+ '-DLD_SO_CONF="/etc/ld.so.conf"' \
|
|
|
+ '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
|
|
|
+popd
|
|
|
|
|
|
%install
|
|
|
GCC=`cat Gcc`
|
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
mkdir -p $RPM_BUILD_ROOT
|
|
|
-make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s
|
|
|
+make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{target} PARALLELMFLAGS=-s
|
|
|
chmod +x $RPM_BUILD_ROOT%{_prefix}/libexec/pt_chown
|
|
|
%ifnarch %{auxarches}
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl && \
|
|
|
+cd build-%{target} && \
|
|
|
make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \
|
|
|
cd ..
|
|
|
%endif
|
|
|
@@ -588,68 +628,88 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$li
|
|
|
ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$librtso
|
|
|
%endif
|
|
|
|
|
|
+install_different()
|
|
|
+{
|
|
|
+ local lib libbase libbaseso dlib
|
|
|
+ local destdir="$1"
|
|
|
+ local subdir="$2"
|
|
|
+ local subdir_up="$3"
|
|
|
+ local libdestdir="$destdir/$subdir"
|
|
|
+ # All three arguments must be non-zero paths.
|
|
|
+ if ! [ "$destdir" \
|
|
|
+ -a "$subdir" \
|
|
|
+ -a "$subdir_up" ]; then
|
|
|
+ echo "One of the arguments to install_different was emtpy."
|
|
|
+ exit 1
|
|
|
+ fi
|
|
|
+ # Create the destination directory and the multilib directory.
|
|
|
+ mkdir -p "$destdir"
|
|
|
+ mkdir -p "$libdestdir"
|
|
|
+ # Walk all of the libraries we installed...
|
|
|
+ for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
|
|
|
+ do
|
|
|
+ libbase=${lib#*/}
|
|
|
+ # Take care that `libbaseso' has a * that needs expanding so
|
|
|
+ # take care with quoting.
|
|
|
+ libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
|
|
|
+ # Only install if different from default build library.
|
|
|
+ if cmp -s ${lib}.so ../build-%{target}/${lib}.so; then
|
|
|
+ ln -sf "$subdir_up"/$libbaseso $libdestdir/$libbaseso
|
|
|
+ else
|
|
|
+ cp -a ${lib}.so $libdestdir/$libbaseso
|
|
|
+ fi
|
|
|
+ dlib=$libdestdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
|
|
|
+ ln -sf $libbaseso $dlib
|
|
|
+ done
|
|
|
+%ifarch %{rtkaioarches}
|
|
|
+ local rtkdestdir="$RPM_BUILD_ROOT/%{_lib}/rtkaio/$subdir"
|
|
|
+ local librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
|
|
|
+ mkdir -p $rtkdestdir
|
|
|
+ librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
|
|
|
+ if cmp -s rtkaio/librtkaio.so ../build-%{target}/rtkaio/librtkaio.so; then
|
|
|
+ ln -s %{nosegneg_subdir_up}/$librtkaioso $rtkdestdir/$librtkaioso
|
|
|
+ else
|
|
|
+ cp -a rtkaio/librtkaio.so $rtkdestdir/$librtkaioso
|
|
|
+ fi
|
|
|
+ ln -sf $librtkaioso $rtkdestdir/$librtso
|
|
|
+%endif
|
|
|
+}
|
|
|
+
|
|
|
%if %{buildxen}
|
|
|
%define nosegneg_subdir_base i686
|
|
|
%define nosegneg_subdir i686/nosegneg
|
|
|
%define nosegneg_subdir_up ../..
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
|
|
|
-destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir}
|
|
|
-mkdir -p $destdir
|
|
|
-for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
|
|
|
-do
|
|
|
- libbase=${lib#*/}
|
|
|
- libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
|
|
|
- # Only install if different from base lib
|
|
|
- if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then
|
|
|
- ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso
|
|
|
- else
|
|
|
- cp -a ${lib}.so $destdir/$libbaseso
|
|
|
- fi
|
|
|
- ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
|
|
|
-done
|
|
|
-%ifarch %{rtkaioarches}
|
|
|
-destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir}
|
|
|
-mkdir -p $destdir
|
|
|
-librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
|
|
|
-if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then
|
|
|
- ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso
|
|
|
-else
|
|
|
- cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
|
|
|
-fi
|
|
|
-ln -sf $librtkaioso $destdir/$librtso
|
|
|
-%endif
|
|
|
-cd ..
|
|
|
+pushd build-%{target}-nosegneg
|
|
|
+destdir=$RPM_BUILD_ROOT/%{_lib}
|
|
|
+install_different "$destdir" "%{nosegneg_subdir}" "%{nosegneg_subdir_up}"
|
|
|
+popd
|
|
|
%endif
|
|
|
|
|
|
%if %{buildpower6}
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl-power6
|
|
|
-destdir=$RPM_BUILD_ROOT/%{_lib}/power6
|
|
|
-mkdir -p ${destdir}
|
|
|
-for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db
|
|
|
-do
|
|
|
- libbase=${lib#*/}
|
|
|
- libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so)
|
|
|
- cp -a ${lib}.so $destdir/$libbaseso
|
|
|
- ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
|
|
|
-done
|
|
|
-mkdir -p ${destdir}x
|
|
|
-pushd ${destdir}x
|
|
|
-ln -sf ../power6/*.so .
|
|
|
-cp -a ../power6/*.so.* .
|
|
|
+%define power6_subdir power6
|
|
|
+%define power6_subdir_up ..
|
|
|
+%define power6_legacy power6x
|
|
|
+%define power6_legacy_up ..
|
|
|
+pushd build-%{target}-power6
|
|
|
+destdir=$RPM_BUILD_ROOT/%{_lib}
|
|
|
+install_different "$destdir" "%{power6_subdir}" "%{power6_subdir_up}"
|
|
|
+# Make a legacy /usr/lib[64]/power6x directory that is a symlink to the
|
|
|
+# power6 runtime.
|
|
|
+# XXX: When can we remove this? What is the history behind this?
|
|
|
+mkdir -p ${destdir}/%{power6_legacy}
|
|
|
+pushd ${destdir}/%{power6_legacy}
|
|
|
+ln -sf %{power6_legacy_up}/%{power6_subdir}/*.so .
|
|
|
+cp -a %{power6_legacy_up}/%{power6_subdir}/*.so.* .
|
|
|
popd
|
|
|
%ifarch %{rtkaioarches}
|
|
|
-destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/power6
|
|
|
-mkdir -p $destdir
|
|
|
-librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/)
|
|
|
-cp -a rtkaio/librtkaio.so $destdir/$librtkaioso
|
|
|
-ln -sf $librtkaioso $destdir/$librtso
|
|
|
-mkdir -p ${destdir}x
|
|
|
-pushd ${destdir}x
|
|
|
+destdir=${destdir}/rtkaio
|
|
|
+mkdir -p ${destdir}/%{power6_legacy}
|
|
|
+pushd ${destdir}/%{power6_legacy}
|
|
|
ln -sf ../power6/*.so .
|
|
|
cp -a ../power6/*.so.* .
|
|
|
popd
|
|
|
%endif
|
|
|
-cd ..
|
|
|
+popd
|
|
|
%endif
|
|
|
|
|
|
# Remove the files we don't want to distribute
|
|
|
@@ -660,7 +720,7 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion*
|
|
|
# the generic one (#162634)
|
|
|
cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
|
|
|
# And <bits/libc-lock.h> needs sanitizing as well.
|
|
|
-cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
|
|
|
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
|
|
|
|
|
|
if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_infodir}
|
|
|
@@ -672,7 +732,7 @@ gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc*
|
|
|
|
|
|
ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
|
|
|
|
|
|
-install -p -m 644 fedora/nsswitch.conf $RPM_BUILD_ROOT/etc/nsswitch.conf
|
|
|
+install -p -m 644 %{SOURCE7} $RPM_BUILD_ROOT/etc/nsswitch.conf
|
|
|
|
|
|
mkdir -p $RPM_BUILD_ROOT/etc/default
|
|
|
install -p -m 644 nis/nss $RPM_BUILD_ROOT/etc/default/nss
|
|
|
@@ -696,7 +756,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
|
|
|
chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
|
|
|
|
|
|
# Install the upgrade program
|
|
|
-install -m 700 build-%{nptl_target_cpu}-linuxnptl/glibc_post_upgrade.%{_target_cpu} \
|
|
|
+install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
|
|
|
$RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
|
|
|
|
|
|
strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
|
|
|
@@ -716,17 +776,17 @@ pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
|
|
|
rm locale-archive || :
|
|
|
# Intentionally we do not pass --alias-file=, aliases will be added
|
|
|
# by build-locale-archive.
|
|
|
-$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
|
|
|
- --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
|
|
|
- $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
|
|
|
- --prefix ${RPM_BUILD_ROOT} --add-to-archive \
|
|
|
- *_*
|
|
|
+$olddir/build-%{target}/elf/ld.so \
|
|
|
+ --library-path $olddir/build-%{target}/ \
|
|
|
+ $olddir/build-%{target}/locale/localedef \
|
|
|
+ --prefix ${RPM_BUILD_ROOT} --add-to-archive \
|
|
|
+ *_*
|
|
|
mv locale-archive{,-extra.tmpl}
|
|
|
-$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \
|
|
|
- --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \
|
|
|
- $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \
|
|
|
- --prefix ${RPM_BUILD_ROOT} --add-to-archive \
|
|
|
- ja_JP* en_US*
|
|
|
+$olddir/build-%{target}/elf/ld.so \
|
|
|
+ --library-path $olddir/build-%{target}/ \
|
|
|
+ $olddir/build-%{target}/locale/localedef \
|
|
|
+ --prefix ${RPM_BUILD_ROOT} --add-to-archive \
|
|
|
+ ja_JP* en_US*
|
|
|
mv locale-archive{,.tmpl}
|
|
|
cp -a locale-archive{.tmpl,-ja.tmpl}
|
|
|
rm -rf *_*
|
|
|
@@ -816,7 +876,7 @@ grep '%{_prefix}/share' < rpm.filelist | \
|
|
|
|
|
|
sed -i -e '\|%{_prefix}/bin|d' \
|
|
|
-e '\|%{_prefix}/lib/locale|d' \
|
|
|
- -e '\|%{_prefix}/libexec/pt_chown|d' \
|
|
|
+ -e '\|%{_prefix}/libexec/pt_chown|d' \
|
|
|
-e '\|%{_prefix}/sbin/[^gi]|d' \
|
|
|
-e '\|%{_prefix}/share|d' rpm.filelist
|
|
|
|
|
|
@@ -845,29 +905,25 @@ EOF
|
|
|
|
|
|
# /etc/localtime
|
|
|
rm -f $RPM_BUILD_ROOT/etc/localtime
|
|
|
-##VINE##cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/US/Eastern $RPM_BUILD_ROOT/etc/localtime
|
|
|
-cp -f $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
|
|
|
+cp -f %{_datadir}/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
|
|
|
|
|
|
rm -rf $RPM_BUILD_ROOT%{_prefix}/share/zoneinfo
|
|
|
|
|
|
# Make sure %config files have the same timestamp
|
|
|
-touch -r fedora/glibc.spec.in $RPM_BUILD_ROOT/etc/ld.so.conf
|
|
|
-touch -r timezone/northamerica $RPM_BUILD_ROOT/etc/localtime
|
|
|
+touch -r %{SOURCE2} $RPM_BUILD_ROOT/etc/ld.so.conf
|
|
|
+touch -r %{_datadir}/zoneinfo/Asia/Tokyo $RPM_BUILD_ROOT/etc/localtime
|
|
|
touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc
|
|
|
|
|
|
-cd fedora
|
|
|
-$GCC -Os -g -o build-locale-archive build-locale-archive.c \
|
|
|
- ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \
|
|
|
- ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \
|
|
|
- -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
|
|
|
- -L../build-%{nptl_target_cpu}-linuxnptl \
|
|
|
- -B../build-%{nptl_target_cpu}-linuxnptl/csu/ -lc -lc_nonshared
|
|
|
+pushd build-%{target}
|
|
|
+$GCC -Os -g -o build-locale-archive %{SOURCE1} \
|
|
|
+ ../build-%{target}/locale/locarchive.o \
|
|
|
+ ../build-%{target}/locale/md5.o \
|
|
|
+ -I. -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
|
|
|
+ -L../build-%{target} \
|
|
|
+ -Wl,--allow-shlib-undefined \
|
|
|
+ -B../build-%{target}/csu/ -lc -lc_nonshared
|
|
|
install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
|
|
|
-# Convert tzdata-update to lua
|
|
|
-# $GCC -Os -g -static -o tzdata-update tzdata-update.c \
|
|
|
-# -L../build-%{nptl_target_cpu}-linuxnptl
|
|
|
-# install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update
|
|
|
-cd ..
|
|
|
+popd
|
|
|
|
|
|
# the last bit: more documentation
|
|
|
rm -rf documentation
|
|
|
@@ -892,31 +948,32 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2
|
|
|
%endif
|
|
|
|
|
|
%if %{run_glibc_tests}
|
|
|
-
|
|
|
# Increase timeouts
|
|
|
export TIMEOUTFACTOR=16
|
|
|
parent=$$
|
|
|
echo ====================TESTING=========================
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl
|
|
|
+pushd build-%{target}
|
|
|
( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
|
|
|
sleep 10s
|
|
|
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
|
|
|
[ -n "$teepid" ] && kill $teepid
|
|
|
) | tee check.log || :
|
|
|
-cd ..
|
|
|
+popd
|
|
|
+
|
|
|
%if %{buildxen}
|
|
|
echo ====================TESTING -mno-tls-direct-seg-refs=============
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
|
|
|
+pushd build-%{target}-nosegneg
|
|
|
( make %{?_smp_mflags} -k check PARALLELMFLAGS=-s 2>&1
|
|
|
sleep 10s
|
|
|
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
|
|
|
[ -n "$teepid" ] && kill $teepid
|
|
|
) | tee check.log || :
|
|
|
-cd ..
|
|
|
+popd
|
|
|
%endif
|
|
|
+
|
|
|
%if %{buildpower6}
|
|
|
echo ====================TESTING -mcpu=power6=============
|
|
|
-cd build-%{nptl_target_cpu}-linuxnptl-power6
|
|
|
+pushd build-%{target}-power6
|
|
|
( if [ -d ../power6emul ]; then
|
|
|
export LD_PRELOAD=`cd ../power6emul; pwd`/\$LIB/power6emul.so
|
|
|
fi
|
|
|
@@ -925,7 +982,7 @@ cd build-%{nptl_target_cpu}-linuxnptl-power6
|
|
|
teepid="`ps -eo ppid,pid,command | awk '($1 == '${parent}' && $3 ~ /^tee/) { print $2 }'`"
|
|
|
[ -n "$teepid" ] && kill $teepid
|
|
|
) | tee check.log || :
|
|
|
-cd ..
|
|
|
+popd
|
|
|
%endif
|
|
|
echo ====================TESTING DETAILS=================
|
|
|
for i in `sed -n 's|^.*\*\*\* \[\([^]]*\.out\)\].*$|\1|p' build-*-linux*/check.log`; do
|
|
|
@@ -943,20 +1000,37 @@ echo ====================PLT RELOCS END==================
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+###############################################################################
|
|
|
+# Rebuild libpthread.a using --whole-archive to ensure all of libpthread
|
|
|
+# is included in a static link. This prevents any problems when linking
|
|
|
+# statically, using parts of libpthread, and other necessary parts not
|
|
|
+# being included. Upstream has decided that this is the wrong approach to
|
|
|
+# this problem and that the full set of dependencies should be resolved
|
|
|
+# such that static linking works and produces the most minimally sized
|
|
|
+# static application possible.
|
|
|
+###############################################################################
|
|
|
pushd $RPM_BUILD_ROOT/usr/%{_lib}/
|
|
|
$GCC -r -nostdlib -o libpthread.o -Wl,--whole-archive ./libpthread.a
|
|
|
rm libpthread.a
|
|
|
ar rcs libpthread.a libpthread.o
|
|
|
rm libpthread.o
|
|
|
popd
|
|
|
+###############################################################################
|
|
|
|
|
|
%if 0%{?_enable_debug_packages}
|
|
|
|
|
|
# The #line directives gperf generates do not give the proper
|
|
|
# file name relative to the build directory.
|
|
|
-(cd locale; ln -s programs/*.gperf .)
|
|
|
-(cd iconv; ln -s ../locale/programs/charmap-kw.gperf .)
|
|
|
+pushd locale
|
|
|
+ln -s programs/*.gperf .
|
|
|
+popd
|
|
|
+pushd iconv
|
|
|
+ln -s ../locale/programs/charmap-kw.gperf .
|
|
|
+popd
|
|
|
|
|
|
+# Print some diagnostic information in the builds about the
|
|
|
+# getconf binaries.
|
|
|
+# XXX: Why do we do this?
|
|
|
ls -l $RPM_BUILD_ROOT/usr/bin/getconf
|
|
|
ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
|
|
|
eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf $RPM_BUILD_ROOT/usr/libexec/getconf/*
|
|
|
@@ -991,28 +1065,43 @@ list_debug_archives()
|
|
|
%define basearch sparc
|
|
|
%endif
|
|
|
|
|
|
-sed -i '\#^%{_prefix}/src/debug/#d' debuginfocommon.filelist
|
|
|
-find $RPM_BUILD_ROOT%{_prefix}/src/debug \
|
|
|
- \( -type d -printf '%%%%dir ' \) , \
|
|
|
- -printf '%{_prefix}/src/debug/%%P\n' > debuginfocommon.sources
|
|
|
-
|
|
|
-# auxarches get only these few source files
|
|
|
+# The auxarches get only these few source files.
|
|
|
auxarches_debugsources=\
|
|
|
'/(generic|linux|%{basearch}|nptl(_db)?)/|/%{glibcsrcdir}/build|/dl-osinfo\.h'
|
|
|
|
|
|
+# Place the source files into the core debuginfo pakcage.
|
|
|
egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist
|
|
|
|
|
|
+# Remove the source files from the common debuginfo package.
|
|
|
egrep -v "$auxarches_debugsources" \
|
|
|
debuginfocommon.sources >> debuginfocommon.filelist
|
|
|
|
|
|
-%endif
|
|
|
+%endif # %{biarcharches}
|
|
|
|
|
|
+# Add the list of *.a archives in the debug directory to
|
|
|
+# the common debuginfo package.
|
|
|
list_debug_archives >> debuginfocommon.filelist
|
|
|
|
|
|
-%endif
|
|
|
-
|
|
|
+# It happens that find-debuginfo.sh produces duplicate entries even
|
|
|
+# though the inputs are unique. Therefore we sort and unique the
|
|
|
+# entries in the debug file lists. This avoids the following warnings:
|
|
|
+# ~~~
|
|
|
+# Processing files: glibc-debuginfo-common-2.17.90-10.fc20.x86_64
|
|
|
+# warning: File listed twice: /usr/lib/debug/usr/sbin/build-locale-archive.debug
|
|
|
+# warning: File listed twice: /usr/lib/debug/usr/sbin/nscd.debug
|
|
|
+# warning: File listed twice: /usr/lib/debug/usr/sbin/zdump.debug
|
|
|
+# warning: File listed twice: /usr/lib/debug/usr/sbin/zic.debug
|
|
|
+# ~~~
|
|
|
+sort -u debuginfocommon.filelist > debuginfocommon2.filelist
|
|
|
+mv debuginfocommon2.filelist debuginfocommon.filelist
|
|
|
+
|
|
|
+%endif # 0%{?_enable_debug_packages}
|
|
|
+
|
|
|
+# Remove the `dir' info-heirarchy file which will be maintained
|
|
|
+# by the system as it adds info files to the install.
|
|
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|
|
|
|
|
+
|
|
|
%ifarch %{auxarches}
|
|
|
|
|
|
echo Cutting down the list of unpackaged files
|
|
|
@@ -1153,6 +1242,7 @@ if posix.access("/etc/ld.so.cache") then
|
|
|
end
|
|
|
end
|
|
|
|
|
|
+
|
|
|
%post devel
|
|
|
/sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
|
|
|
|
|
|
@@ -1245,8 +1335,8 @@ rm -f *.filelist*
|
|
|
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache
|
|
|
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache
|
|
|
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/gai.conf
|
|
|
-%doc README NEWS INSTALL FAQ BUGS NOTES PROJECTS CONFORMANCE
|
|
|
-%doc COPYING COPYING.LIB README.libm LICENSES
|
|
|
+%doc README NEWS INSTALL BUGS PROJECTS CONFORMANCE
|
|
|
+%doc COPYING COPYING.LIB LICENSES
|
|
|
%doc hesiod/README.hesiod
|
|
|
|
|
|
%if %{build_compat32}
|
|
|
@@ -1340,6 +1430,12 @@ rm -f *.filelist*
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.18-1
|
|
|
+- update to 2.18
|
|
|
+- merged with FC 2.18-6.fc21
|
|
|
+- add Source1,2,3 and Patch11,12,13,14,15,16,17,18,19 from Fedora
|
|
|
+- add Patch10001 for vine
|
|
|
+
|
|
|
* Tue Oct 01 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.14.1-4
|
|
|
- rebuild with gcc-4.8.1
|
|
|
|
|
|
@@ -1593,7 +1689,7 @@ rm -f *.filelist*
|
|
|
* Thu Jul 2 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-2
|
|
|
- Update from master.
|
|
|
|
|
|
-* Thu Jun 26 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-1
|
|
|
+* Fri Jun 26 2009 Andreas Schwab <aschwab@redhat.com> 2.10.90-1
|
|
|
- Update from master.
|
|
|
- Enable multi-arch support on x86/x86-64.
|
|
|
- Add requires glibc-headers to glibc-devel (#476295).
|
|
|
@@ -2281,7 +2377,7 @@ rm -f *.filelist*
|
|
|
- fix l{,l}rint{,f,l} around zero (BZ#2592)
|
|
|
- avoid stack trampoline in s390{,x} makecontext
|
|
|
|
|
|
-* Tue Sep 15 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-33
|
|
|
+* Fri Sep 15 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-33
|
|
|
- fix dlclose (#206639)
|
|
|
- don't load platform optimized libraries if kernel doesn't set
|
|
|
AT_PLATFORM
|
|
|
@@ -2384,7 +2480,7 @@ rm -f *.filelist*
|
|
|
- disallow RTLD_GLOBAL flag for dlmopen in secondary namespaces (#197462)
|
|
|
- PI mutex support
|
|
|
|
|
|
-* Tue Jul 10 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-13
|
|
|
+* Mon Jul 10 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-13
|
|
|
- DT_GNU_HASH support
|
|
|
|
|
|
* Fri Jun 30 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-12
|
|
|
@@ -2833,7 +2929,7 @@ rm -f *.filelist*
|
|
|
- grok PT_NOTE in vDSO for kernel version and extra hwcap dirs,
|
|
|
support "hwcap" keyword in ld.so.conf files
|
|
|
|
|
|
-* Tue Apr 4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-21
|
|
|
+* Mon Apr 4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-21
|
|
|
- update from CVS
|
|
|
- fix xdr_rmtcall_args on 64-bit arches (#151686)
|
|
|
- fix <pthread.h> and <bits/libc-lock.h> with -std=c89 -fexceptions (#153774)
|
|
|
@@ -3337,7 +3433,7 @@ rm -f *.filelist*
|
|
|
- use atomic instructions even in i386 nscd on i486+ CPUs
|
|
|
(conditionally)
|
|
|
|
|
|
-* Sat Sep 3 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-49
|
|
|
+* Fri Sep 3 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-49
|
|
|
- update from CVS
|
|
|
- fix linuxthreads tst-cancel{[45],-static}
|
|
|
|
|
|
@@ -3542,7 +3638,7 @@ rm -f *.filelist*
|
|
|
- fix pthread_getattr_np guardsize reporting in NPTL
|
|
|
- report PLT relocations in ld.so and libc.so during the build
|
|
|
|
|
|
-* Fri Mar 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-20
|
|
|
+* Thu Mar 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-20
|
|
|
- update from CVS
|
|
|
- change NPTL PTHREAD_MUTEX_ADAPTIVE_NP mutexes to spin on SMP
|
|
|
- strtol speed optimization
|
|
|
@@ -3825,7 +3921,7 @@ rm -f *.filelist*
|
|
|
ld.so and NPTL (on IA-32 also FLOATING_STACKS linuxthreads) libraries
|
|
|
and tests
|
|
|
|
|
|
-* Tue Aug 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-78
|
|
|
+* Mon Aug 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-78
|
|
|
- include dl-osinfo.h only in glibc-debuginfo-2*.rpm, not
|
|
|
in glibc-debuginfo-common*
|
|
|
|
|
|
@@ -3966,7 +4062,7 @@ rm -f *.filelist*
|
|
|
- don't prelink -R libc.so on any architecture, it prohibits
|
|
|
address randomization
|
|
|
|
|
|
-* Fri Jun 5 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-48
|
|
|
+* Thu Jun 5 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-48
|
|
|
- update from CVS
|
|
|
- fix IA-64 NPTL build
|
|
|
|
|
|
@@ -3980,10 +4076,10 @@ rm -f *.filelist*
|
|
|
- enable NPTL on AMD64
|
|
|
- avoid using trampolines in localedef
|
|
|
|
|
|
-* Fri May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-45
|
|
|
+* Thu May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-45
|
|
|
- enable NPTL on IA-64
|
|
|
|
|
|
-* Fri May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-44
|
|
|
+* Thu May 29 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-44
|
|
|
- update from CVS
|
|
|
- enable NPTL on s390 and s390x
|
|
|
- make __init_array_start etc. symbols in elf-init.oS hidden undefined
|
|
|
@@ -4163,7 +4259,7 @@ rm -f *.filelist*
|
|
|
- fix TLS IE/LE model handling in dlopened libraries
|
|
|
on TCB_AT_TP arches
|
|
|
|
|
|
-* Thu Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-5
|
|
|
+* Tue Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-5
|
|
|
- update from CVS
|
|
|
|
|
|
* Tue Feb 25 2003 Jakub Jelinek <jakub@redhat.com> 2.3.2-4
|
|
|
@@ -4700,7 +4796,7 @@ rm -f *.filelist*
|
|
|
- disable autoreq in glibc-debug
|
|
|
- readd %%lang() to locale files
|
|
|
|
|
|
-* Fri Feb 7 2002 Jakub Jelinek <jakub@redhat.com> 2.2.90-4
|
|
|
+* Thu Feb 7 2002 Jakub Jelinek <jakub@redhat.com> 2.2.90-4
|
|
|
- update to CVS
|
|
|
- move glibc private symbols to GLIBC_PRIVATE symbol version
|
|
|
|
Takemikaduchi