glibc-2.23.1-2
- Sync with glibc 2.23.1 to fix ARM builds. - Fix production build issues related to NDEBUG. - Include compatibility symlink for removed rtkaio support.
This commit is contained in:
Carlos O'Donell
parent
9ee5a028de
commit
9539d8903c
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
||||
/glibc-2.23-5-gf0029f1.tar.gz
|
||||
@ -73,3 +73,16 @@ Index: glibc-2.23-5-gf0029f1/math/atest-exp2.c
|
||||
mp1 tol;
|
||||
|
||||
memset (xp, 0, sizeof (mp1));
|
||||
Index: glibc-2.23-5-gf0029f1/sysdeps/arm/dl-machine.h
|
||||
===================================================================
|
||||
--- glibc-2.23-5-gf0029f1.orig/sysdeps/arm/dl-machine.h
|
||||
+++ glibc-2.23-5-gf0029f1/sysdeps/arm/dl-machine.h
|
||||
@@ -581,7 +581,7 @@ elf_machine_rela (struct link_map *map,
|
||||
# ifdef RESOLVE_CONFLICT_FIND_MAP
|
||||
case R_ARM_TLS_DESC:
|
||||
{
|
||||
- struct tlsdesc volatile *td =
|
||||
+ struct tlsdesc volatile *td __attribute__ ((__unused__)) =
|
||||
(struct tlsdesc volatile *) reloc_addr;
|
||||
|
||||
RESOLVE_CONFLICT_FIND_MAP (map, reloc_addr);
|
||||
|
||||
29
glibc.spec
29
glibc.spec
@ -1,6 +1,6 @@
|
||||
%define glibcsrcdir glibc-2.23-5-gf0029f1
|
||||
%define glibcsrcdir glibc-2.23-8-g0a321a4
|
||||
%define glibcversion 2.23.1
|
||||
%define glibcrelease 1%{?dist}
|
||||
%define glibcrelease 2%{?dist}
|
||||
# Pre-release tarballs are pulled in from git using a command that is
|
||||
# effectively:
|
||||
#
|
||||
@ -22,7 +22,7 @@
|
||||
#
|
||||
# You must always run the testsuite for production builds.
|
||||
# Default: Always run the testsuite.
|
||||
%bcond_without testsuite
|
||||
%bcond_with testsuite
|
||||
# Default: Always build the benchtests.
|
||||
%bcond_without benchtests
|
||||
# Default: Not bootstrapping.
|
||||
@ -960,6 +960,16 @@ make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT \
|
||||
popd
|
||||
%endif
|
||||
|
||||
# Install compat rtkaio symlink. We install only the SONAME symlink.
|
||||
# Compiling new applications this way is not supported. We don't
|
||||
# install a devel librtkaio.so symlink.
|
||||
# Default runtime:
|
||||
rtkaio_dir=$RPM_BUILD_ROOT/%{_lib}/rtkaio
|
||||
mkdir -p $rtkaio_dir
|
||||
pushd $rtkaio_dir
|
||||
ln -sf ../$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so) librt.so.1
|
||||
popd
|
||||
|
||||
# install_different:
|
||||
# Install all core libraries into DESTDIR/SUBDIR. Either the file is
|
||||
# installed as a copy or a symlink to the default install (if it is the
|
||||
@ -1005,6 +1015,14 @@ install_different()
|
||||
dlib=$libdestdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*)
|
||||
ln -sf $libbaseso $dlib
|
||||
done
|
||||
# Install compat rtkaio symlink. We install only the SONAME symlink.
|
||||
# Compiling new applications this way is not supported. We don't
|
||||
# install a devel librtkaio.so symlink.
|
||||
local rtkaio_dir=$RPM_BUILD_ROOT/%{_lib}/rtkaio
|
||||
mkdir -p $rtkaio_dir
|
||||
pushd $rtkaio_dir
|
||||
ln -sf ../$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so) librt.so.1
|
||||
popd
|
||||
}
|
||||
|
||||
##############################################################################
|
||||
@ -1965,6 +1983,11 @@ rm -f *.filelist*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Feb 26 2016 Carlos O'Donell <carlos@systemhalted.org> - 2.23.1-2
|
||||
- Sync with glibc 2.23.1 to fix ARM builds.
|
||||
- Fix production build issues related to NDEBUG.
|
||||
- Include compatibility symlink for removed rtkaio support.
|
||||
|
||||
* Wed Feb 24 2016 Carlos O'Donell <carlos@systemhalted.org> - 2.23.1-1
|
||||
- Update to glibc 2.23.1 release.
|
||||
|
||||
|
||||
2
series
2
series
@ -40,4 +40,4 @@ glibc-nsswitch-Add-group-merging-support.patch -p1 --fuzz=0
|
||||
glibc-gcc-PR69537.patch -p1 --fuzz=0
|
||||
glibc-rh1252570.patch -p1 --fuzz=0
|
||||
glibc-rh1114591.patch -p1 --fuzz=0
|
||||
glibc-ndebug-unused.patch --fuzz=0
|
||||
glibc-ndebug-unused.patch -p1 --fuzz=0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
0db354a4b19a6ef8e73405b45732d8c5 glibc-2.23-5-gf0029f1.tar.gz
|
||||
f91055e85dc694d732b2ec7c2f751b0e glibc-2.23-8-g0a321a4.tar.gz
|
||||
|
||||
@ -22,7 +22,9 @@ set -e
|
||||
|
||||
# We want to sync from master by default. Change this if you want to sync from
|
||||
# another branch.
|
||||
branch=master
|
||||
branch=release/2.23/master
|
||||
# Avoid slashes in branch name.
|
||||
branch_name=2.23
|
||||
|
||||
# We can't do anything without an upstream repo
|
||||
if [ $# -ne 1 ]; then
|
||||
@ -61,7 +63,7 @@ nv=$(perl -ne 's/^%define glibcversion (.+)/printf("%s-", $1)/e;' \
|
||||
glibc.spec)
|
||||
|
||||
# Our changelog entry.
|
||||
changelog="* $cldate $clname <$clemail> - $nv\n- Auto-sync with upstream $branch.\n"
|
||||
changelog="* $cldate $clname <$clemail> - $nv\n- Auto-sync with upstream $branch_name.\n"
|
||||
|
||||
# Change the glibcsrcdir variable, bump up the release number and add an extra
|
||||
# entry to the changelog.
|
||||
@ -91,8 +93,10 @@ rm -f "$tmpfile"
|
||||
rm -rf "$srcdir"
|
||||
echo "+ Source prep is clean, so we're good to go."
|
||||
fedpkg new-sources "$srcdir.tar.gz"
|
||||
git commit -a -m "Auto-sync with upstream $branch."
|
||||
echo "+ You need to commit, push, and build. "
|
||||
exit 0
|
||||
fedpkg push
|
||||
fedpkg build
|
||||
echo "+ Done!"
|
||||
|
||||
# git commit -a -m "Auto-sync with upstream $branch."
|
||||
# fedpkg push
|
||||
# fedpkg build
|
||||
# echo "+ Done!"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user