jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

eglibc: update to eglibc-2.17-22220

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-01-16 23:24:16 +01:00
parent b99509a511
commit b01e7d4812
11 changed files with 31 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/initramfs/devel/eglibc-initramfs/install
View File

@ -25,7 +25,11 @@
EGLIBC_DIR="$BUILD/eglibc-*"
mkdir -p $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/elf/ld*.so.* $INSTALL/lib
cp -PR $EGLIBC_DIR/objdir-eglibc/elf/ld*.so* $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/libc.so.6 $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/math/libm.so.6 $INSTALL/lib
cp $EGLIBC_DIR/objdir-eglibc/nptl/libpthread.so.0 $INSTALL/lib
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
ln -sf ld.so $INSTALL/lib/ld-linux.so.3
fi

6
packages/toolchain/devel/eglibc/build
View File

@ -58,7 +58,8 @@ NSS_CONF_DIR=`ls -d $ROOT/$BUILD/eglibc*/nss`
cd $PKG_BUILD
autoconf
aclocal --force --verbose
autoconf-2.68 --force --verbose
mkdir -p objdir-$1 && cd objdir-$1
@ -139,6 +140,9 @@ EOF
--with-headers=$SYSROOT_PREFIX/usr/include \
--without-cvs \
--without-gd \
--enable-obsolete-rpc \
--disable-build-nscd \
        --disable-nscd \
$DEBUG_CONFIG \
make

4
packages/toolchain/devel/eglibc/install
View File

@ -23,12 +23,12 @@
. config/options $1
mkdir -p $INSTALL/lib
cp $PKG_BUILD/objdir-$1/elf/ld*.so.* $INSTALL/lib
cp -P $PKG_BUILD/objdir-$1/elf/ld*.so* $INSTALL/lib
cp $PKG_BUILD/objdir-$1/libc.so.6 $INSTALL/lib
cp $PKG_BUILD/objdir-$1/math/libm.so.6 $INSTALL/lib
if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
ln -sf ld-linux.so.3 $INSTALL/lib/ld-linux-armhf.so.3
ln -sf ld.so $INSTALL/lib/ld-linux.so.3
fi
mkdir -p $INSTALL/usr/lib

4
packages/toolchain/devel/eglibc/meta
View File

@ -19,14 +19,14 @@
################################################################################
PKG_NAME="eglibc"
PKG_VERSION="2.15-20165"
PKG_VERSION="2.17-22220"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.eglibc.org/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="timezone-data"
PKG_BUILD_DEPENDS="ccache autotools linux-headers gcc-core"
PKG_BUILD_DEPENDS="ccache autotools autoconf-2.68 linux-headers gcc-core"
PKG_PRIORITY="optional"
PKG_SECTION="toolchain/devel"
PKG_SHORTDESC="eglibc: The Embedded GNU C library"

52
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-RH730856.patch
View File

@ -1,52 +0,0 @@
diff -rup a/resolv/res_query.c b/resolv/res_query.c
--- a/resolv/res_query.c 2012-02-16 22:51:17.451796009 -0700
+++ b/resolv/res_query.c 2012-02-16 22:54:42.522623598 -0700
@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
int *resplen2)
{
HEADER *hp = (HEADER *) answer;
+ HEADER *hp2;
int n, use_malloc = 0;
u_int oflags = statp->_flags;
@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
/* __libc_res_nsend might have reallocated the buffer. */
hp = (HEADER *) *answerp;
- /* We simplify the following tests by assigning HP to HP2. It
- is easy to verify that this is the same as ignoring all
- tests of HP2. */
- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
-
- if (n < (int) sizeof (HEADER) && answerp2 != NULL
- && *resplen2 > (int) sizeof (HEADER))
+ /* We simplify the following tests by assigning HP to HP2 or
+ vice versa. It is easy to verify that this is the same as
+ ignoring all tests of HP or HP2. */
+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
{
- /* Special case of partial answer. */
- assert (hp != hp2);
- hp = hp2;
+ hp2 = hp;
}
- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
- && n > (int) sizeof (HEADER))
+ else
{
- /* Special case of partial answer. */
- assert (hp != hp2);
- hp2 = hp;
+ hp2 = (HEADER *) *answerp2;
+ if (n < (int) sizeof (HEADER))
+ {
+ hp = hp2;
+ }
}
+ /* Make sure both hp and hp2 are defined */
+ assert((hp != NULL) && (hp2 != NULL));
+
if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
&& (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
#ifdef DEBUG

12
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-RH737223.patch
View File

@ -1,12 +0,0 @@
diff -Naur eglibc-2.15-17022/elf/rtld.c eglibc-2.15-17022.patch/elf/rtld.c
--- eglibc-2.15-17022/elf/rtld.c 2012-02-07 05:47:54.000000000 +0100
+++ eglibc-2.15-17022.patch/elf/rtld.c 2012-02-10 04:52:55.462289159 +0100
@@ -1398,7 +1398,7 @@
char *copy = malloc (len);
if (copy == NULL)
_dl_fatal_printf ("out of memory\n");
- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
+ l->l_libname->name = memcpy (copy, dsoname, len);
}
/* Add the vDSO to the object list. */

134
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-bad-fix.patch
View File

@ -1,134 +0,0 @@
From 675155e9084e060fd0e1e637b843f14e82898aa5 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Wed, 22 Sep 2010 12:06:30 +0200
Subject: [PATCH] Fix memory leak on init/fini dependency list
diff -Naur eglibc-2.14.1-15769/elf/dl-close.c eglibc-2.14.1-15769.patch/elf/dl-close.c
--- eglibc-2.14.1-15769/elf/dl-close.c 2011-11-10 17:59:49.000000000 +0100
+++ eglibc-2.14.1-15769.patch/elf/dl-close.c 2011-11-11 13:11:54.317765891 +0100
@@ -1,5 +1,5 @@
/* Close a shared object opened by `_dl_open'.
- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -119,17 +119,8 @@
if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
|| dl_close_state != not_pending)
{
- if (map->l_direct_opencount == 0)
- {
- if (map->l_type == lt_loaded)
- dl_close_state = rerun;
- else if (map->l_type == lt_library)
- {
- struct link_map **oldp = map->l_initfini;
- map->l_initfini = map->l_orig_initfini;
- _dl_scope_free (oldp);
- }
- }
+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
+ dl_close_state = rerun;
/* There are still references to this object. Do nothing more. */
if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
diff -Naur eglibc-2.14.1-15769/elf/dl-deps.c eglibc-2.14.1-15769.patch/elf/dl-deps.c
--- eglibc-2.14.1-15769/elf/dl-deps.c 2011-11-10 17:59:49.000000000 +0100
+++ eglibc-2.14.1-15769.patch/elf/dl-deps.c 2011-11-11 13:14:07.711207504 +0100
@@ -478,6 +478,7 @@
nneeded * sizeof needed[0]);
atomic_write_barrier ();
l->l_initfini = l_initfini;
+ l->l_free_initfini = 1;
}
/* If we have no auxiliary objects just go on to the next map. */
@@ -678,6 +679,7 @@
l_initfini[nlist] = NULL;
atomic_write_barrier ();
map->l_initfini = l_initfini;
+ map->l_free_initfini = 1;
if (l_reldeps != NULL)
{
atomic_write_barrier ();
@@ -686,7 +688,7 @@
_dl_scope_free (old_l_reldeps);
}
if (old_l_initfini != NULL)
- map->l_orig_initfini = old_l_initfini;
+ _dl_scope_free (old_l_initfini);
if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
diff -Naur eglibc-2.14.1-15769/elf/dl-libc.c eglibc-2.14.1-15769.patch/elf/dl-libc.c
--- eglibc-2.14.1-15769/elf/dl-libc.c 2011-11-10 17:59:49.000000000 +0100
+++ eglibc-2.14.1-15769.patch/elf/dl-libc.c 2011-11-11 13:11:54.319765853 +0100
@@ -265,13 +265,13 @@
for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
{
- /* Remove all additional names added to the objects. */
for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
{
struct libname_list *lnp = l->l_libname->next;
l->l_libname->next = NULL;
+ /* Remove all additional names added to the objects. */
while (lnp != NULL)
{
struct libname_list *old = lnp;
@@ -279,6 +279,10 @@
if (! old->dont_free)
free (old);
}
+
+ /* Free the initfini dependency list. */
+ if (l->l_free_initfini)
+ free (l->l_initfini);
}
if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
diff -Naur eglibc-2.14.1-15769/elf/rtld.c eglibc-2.14.1-15769.patch/elf/rtld.c
--- eglibc-2.14.1-15769/elf/rtld.c 2011-11-10 17:59:49.000000000 +0100
+++ eglibc-2.14.1-15769.patch/elf/rtld.c 2011-11-11 13:11:54.320765834 +0100
@@ -2264,6 +2264,7 @@
lnp->dont_free = 1;
lnp = lnp->next;
}
+ l->l_free_initfini = 0;
if (l != &GL(dl_rtld_map))
_dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
diff -Naur eglibc-2.14.1-15769/include/link.h eglibc-2.14.1-15769.patch/include/link.h
--- eglibc-2.14.1-15769/include/link.h 2011-11-10 17:59:51.000000000 +0100
+++ eglibc-2.14.1-15769.patch/include/link.h 2011-11-11 13:11:54.321765815 +0100
@@ -1,6 +1,6 @@
/* Data structure for communication from the run-time dynamic linker for
loaded ELF shared objects.
- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -192,6 +192,9 @@
during LD_TRACE_PRELINKING=1
contains any DT_SYMBOLIC
libraries. */
+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
+ freed, ie. not allocated with
+ the dummy malloc in ld.so. */
/* Collected information about own RPATH directories. */
struct r_search_path_struct l_rpath_dirs;
@@ -240,9 +243,6 @@
/* List of object in order of the init and fini calls. */
struct link_map **l_initfini;
- /* The init and fini list generated at startup, saved when the
- object is also loaded dynamically. */
- struct link_map **l_orig_initfini;
/* List of the dependencies introduced through symbol binding. */
struct link_map_reldeps

64
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-libgcc_eh-1.patch
View File

@ -1,64 +0,0 @@
diff -Naur glibc-2.11.orig/Makeconfig glibc-2.11/Makeconfig
--- glibc-2.11.orig/Makeconfig 2009-10-30 13:17:08.000000000 -0400
+++ glibc-2.11/Makeconfig 2009-11-13 12:14:18.000000000 -0500
@@ -538,12 +538,20 @@
libunwind = -lunwind
endif
ifneq ($(have-as-needed),yes)
- libgcc_eh := -lgcc_eh $(libunwind)
+ ifneq ($(have-cc-with-libgcc_eh),yes)
+ libgcc_eh := $(libunwind)
+ else
+ libgcc_eh := -lgcc_eh $(libunwind)
+ endif
else
libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
endif
gnulib := -lgcc $(libgcc_eh)
-static-gnulib := -lgcc -lgcc_eh $(libunwind)
+ifneq ($(have-cc-with-libgcc_eh),yes)
+ static-gnulib := -lgcc $(libunwind)
+else
+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
+endif
libc.so-gnulib := -lgcc
endif
ifeq ($(elf),yes)
diff -Naur glibc-2.11.orig/config.make.in glibc-2.11/config.make.in
--- glibc-2.11.orig/config.make.in 2009-10-30 13:17:08.000000000 -0400
+++ glibc-2.11/config.make.in 2009-11-13 12:14:18.000000000 -0500
@@ -64,6 +64,7 @@
have-libaudit = @have_libaudit@
have-libcap = @have_libcap@
have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
fno-unit-at-a-time = @fno_unit_at_a_time@
bind-now = @bindnow@
have-hash-style = @libc_cv_hashstyle@
diff -Naur glibc-2.11.orig/configure.in glibc-2.11/configure.in
--- glibc-2.11.orig/configure.in 2009-10-30 13:17:08.000000000 -0400
+++ glibc-2.11/configure.in 2009-11-13 12:14:18.000000000 -0500
@@ -1505,6 +1505,23 @@
AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
fi
+ AC_CACHE_CHECK(whether to link against libgcc_eh,
+ libc_cv_cc_with_libgcc_eh, [
+ cat > conftest.c <<EOF
+int main (void) { return 0; }
+EOF
+ if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
+ conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
+ libc_cv_cc_with_libgcc_eh=yes
+ else
+ libc_cv_cc_with_libgcc_eh=no
+ fi
+ rm -f conftest*])
+ AC_SUBST(libc_cv_cc_with_libgcc_eh)
+ if test $libc_cv_cc_with_libgcc_eh = yes; then
+ AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
+ fi
+
AC_CACHE_CHECK(for -z nodelete option,
libc_cv_z_nodelete, [dnl
cat > conftest.c <<EOF

59
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-restore-rpc+nis.patch
View File

@ -1,59 +0,0 @@
diff -Naur eglibc-2.14-15360/include/libc-symbols.h eglibc-2.14-15360.patch/include/libc-symbols.h
--- eglibc-2.14-15360/include/libc-symbols.h 2011-09-17 16:13:20.000000000 +0200
+++ eglibc-2.14-15360.patch/include/libc-symbols.h 2011-09-18 19:00:16.559302295 +0200
@@ -656,7 +656,7 @@
# define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
# define libc_hidden_def(name) hidden_def (name)
# define libc_hidden_weak(name) hidden_weak (name)
-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
+# define libc_hidden_nolink(name, version) hidden_def (name)
# define libc_hidden_ver(local, name) hidden_ver (local, name)
# define libc_hidden_data_def(name) hidden_data_def (name)
# define libc_hidden_data_weak(name) hidden_data_weak (name)
diff -Naur eglibc-2.14-15360/nis/Makefile eglibc-2.14-15360.patch/nis/Makefile
--- eglibc-2.14-15360/nis/Makefile 2011-09-17 16:13:06.000000000 +0200
+++ eglibc-2.14-15360.patch/nis/Makefile 2011-09-18 19:00:16.526301845 +0200
@@ -25,9 +25,9 @@
aux := nis_hash
+headers := $(wildcard rpcsvc/*.[hx])
distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
- nisplus-parser.h nis_xdr.h nss \
- $(wildcard rpcsvc/*.[hx])
+ nisplus-parser.h nis_xdr.h nss
# These are the databases available for the nis (and perhaps later nisplus)
# service. This must be a superset of the services in nss.
@@ -78,6 +78,8 @@
include ../Rules
+CFLAGS-nis_findserv.c += -fno-strict-aliasing
+CFLAGS-ypclnt.c += -fno-strict-aliasing
$(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
$(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
diff -Naur eglibc-2.14-15360/sunrpc/Makefile eglibc-2.14-15360.patch/sunrpc/Makefile
--- eglibc-2.14-15360/sunrpc/Makefile 2011-09-17 16:13:12.000000000 +0200
+++ eglibc-2.14-15360.patch/sunrpc/Makefile 2011-09-18 19:01:31.772325016 +0200
@@ -55,7 +55,7 @@
des_crypt.h)
headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
$(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
-headers = rpc/netdb.h
+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
$(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
generated-dirs := rpcsvc
@@ -165,6 +165,10 @@
CPPFLAGS += -D_RPC_THREAD_SAFE_
+CFLAGS-clnt_tcp.c += -fno-strict-aliasing
+CFLAGS-clnt_udp.c += -fno-strict-aliasing
+CFLAGS-clnt_unix.c += -fno-strict-aliasing
+
$(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
$(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
$(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so

0
packages/toolchain/devel/eglibc/patches/eglibc-2.15-20165-select_fd_type.patch → packages/toolchain/devel/eglibc/patches/eglibc-2.17-22220-select_fd_type.patch
View File

34
tools/mkpkg/mkpkg_eglibc-2.15 → tools/mkpkg/mkpkg_eglibc-2.17
View File

@ -20,48 +20,48 @@
################################################################################
echo "getting sources..."
svn co svn://svn.eglibc.org/branches/eglibc-2_15/libc eglibc-2.15-latest
svn co svn://svn.eglibc.org/branches/eglibc-2_15/ports eglibc-2.15-latest/ports
svn co svn://svn.eglibc.org/branches/eglibc-2_15/linuxthreads/linuxthreads eglibc-2.15-latest/linuxthreads
svn co svn://svn.eglibc.org/branches/eglibc-2_15/linuxthreads/linuxthreads_db eglibc-2.15-latest/linuxthreads_db
svn co svn://svn.eglibc.org/branches/eglibc-2_17/libc eglibc-2.17-latest
svn co svn://svn.eglibc.org/branches/eglibc-2_17/ports eglibc-2.17-latest/ports
svn co svn://svn.eglibc.org/branches/eglibc-2_17/linuxthreads/linuxthreads eglibc-2.17-latest/linuxthreads
svn co svn://svn.eglibc.org/branches/eglibc-2_17/linuxthreads/linuxthreads_db eglibc-2.17-latest/linuxthreads_db
echo "getting version..."
cd eglibc-2.15-latest
cd eglibc-2.17-latest
SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
echo $SVN_REV
cd ..
echo "copying sources..."
rm -rf eglibc-2.15-$SVN_REV
cp -R eglibc-2.15-latest eglibc-2.15-$SVN_REV
rm -rf eglibc-2.17-$SVN_REV
cp -R eglibc-2.17-latest eglibc-2.17-$SVN_REV
echo "cleaning sources..."
find eglibc-2.15-$SVN_REV -name .svn -exec rm -rf {} ";"
find eglibc-2.17-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
tar cvJf eglibc-2.15-$SVN_REV.tar.xz eglibc-2.15-$SVN_REV
tar cvJf eglibc-2.17-$SVN_REV.tar.xz eglibc-2.17-$SVN_REV
echo "remove temporary sourcedir..."
rm -rf eglibc-2.15-$SVN_REV
rm -rf eglibc-2.17-$SVN_REV
# now localedef
svn co svn://svn.eglibc.org/branches/eglibc-2_15/localedef eglibc-localedef-2.15-latest
svn co svn://svn.eglibc.org/branches/eglibc-2_17/localedef eglibc-localedef-2.17-latest
echo "getting version..."
cd eglibc-localedef-2.15-latest
cd eglibc-localedef-2.17-latest
SVN_REV=`LANG=C svn info 2>/dev/null | grep Revision: | sed -e 's/.*\: //'`
echo $SVN_REV
cd ..
echo "copying sources..."
rm -rf eglibc-localedef-2.15-$SVN_REV
cp -R eglibc-localedef-2.15-latest eglibc-localedef-2.15-$SVN_REV
rm -rf eglibc-localedef-2.17-$SVN_REV
cp -R eglibc-localedef-2.17-latest eglibc-localedef-2.17-$SVN_REV
echo "cleaning sources..."
find eglibc-localedef-2.15-$SVN_REV -name .svn -exec rm -rf {} ";"
find eglibc-localedef-2.17-$SVN_REV -name .svn -exec rm -rf {} ";"
echo "packing sources..."
tar cvJf eglibc-localedef-2.15-$SVN_REV.tar.xz eglibc-localedef-2.15-$SVN_REV
tar cvJf eglibc-localedef-2.17-$SVN_REV.tar.xz eglibc-localedef-2.17-$SVN_REV
echo "remove temporary sourcedir..."
rm -rf eglibc-localedef-2.15-$SVN_REV
rm -rf eglibc-localedef-2.17-$SVN_REV