From b80f70c056c83461f1d5755427cb3331e635487c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 6 Nov 2009 14:57:06 +0100 Subject: [PATCH] uClibc: - update to uClibc-0.9.30.2-20091030 - cleanup patches - cleanup scripts --- packages/toolchain/devel/uClibc/build | 3 +- ...uClibc.devtools.conf => uClibc.debug.conf} | 0 .../devel/uClibc/config/uClibc.i386.1.conf | 243 ++++++++++++++++++ .../devel/uClibc/config/uClibc.i386.conf | 14 +- packages/toolchain/devel/uClibc/install | 3 +- .../uClibc/patches/12_gen_bits_syscall_h.diff | 11 - .../patches/uClibc-0.9.30.1-add_rpmatch.diff | 80 ------ .../patches/uClibc-0.9.30.1-add_timerfd.diff | 119 --------- .../patches/uClibc-0.9.30.2-20091017_fix.diff | 10 - packages/toolchain/devel/uClibc/unpack | 4 +- packages/toolchain/devel/uClibc/url | 2 +- 11 files changed, 257 insertions(+), 232 deletions(-) rename packages/toolchain/devel/uClibc/config/{uClibc.devtools.conf => uClibc.debug.conf} (100%) create mode 100644 packages/toolchain/devel/uClibc/config/uClibc.i386.1.conf delete mode 100644 packages/toolchain/devel/uClibc/patches/12_gen_bits_syscall_h.diff delete mode 100644 packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_rpmatch.diff delete mode 100644 packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_timerfd.diff delete mode 100644 packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff diff --git a/packages/toolchain/devel/uClibc/build b/packages/toolchain/devel/uClibc/build index f9b4cb50a2..c3f91029f5 100755 --- a/packages/toolchain/devel/uClibc/build +++ b/packages/toolchain/devel/uClibc/build @@ -6,6 +6,5 @@ $SCRIPTS/install gcc-core toolchain [ "$DEBUG" = yes ] && CFLAGS="$CFLAGS -D_DLSYM_TRACE_NAME" make -C $PKG_BUILD -#[ "$DEVTOOLS" = yes ] && make -C $PKG_BUILD/utils -make -C $PKG_BUILD/utils +[ "$DEVTOOLS" = yes ] && make -C $PKG_BUILD/utils exit 0 diff --git a/packages/toolchain/devel/uClibc/config/uClibc.devtools.conf b/packages/toolchain/devel/uClibc/config/uClibc.debug.conf similarity index 100% rename from packages/toolchain/devel/uClibc/config/uClibc.devtools.conf rename to packages/toolchain/devel/uClibc/config/uClibc.debug.conf diff --git a/packages/toolchain/devel/uClibc/config/uClibc.i386.1.conf b/packages/toolchain/devel/uClibc/config/uClibc.i386.1.conf new file mode 100644 index 0000000000..2875700d9f --- /dev/null +++ b/packages/toolchain/devel/uClibc/config/uClibc.i386.1.conf @@ -0,0 +1,243 @@ +# +# Automatically generated make config: don't edit +# Version: 0.9.30-git +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_avr32 is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +TARGET_i386=y +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set +# TARGET_xtensa is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="i386" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_GENERIC_386 is not set +# CONFIG_386 is not set +# CONFIG_486 is not set +CONFIG_586=y +# CONFIG_586MMX is not set +# CONFIG_686 is not set +# CONFIG_PENTIUMII is not set +# CONFIG_PENTIUMIII is not set +# CONFIG_PENTIUM4 is not set +# CONFIG_K6 is not set +# CONFIG_K7 is not set +# CONFIG_ELAN is not set +# CONFIG_CRUSOE is not set +# CONFIG_WINCHIPC6 is not set +# CONFIG_WINCHIP2 is not set +# CONFIG_CYRIXIII is not set +# CONFIG_NEHEMIAH is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_LITTLE_ENDIAN=y + +# +# Using Little Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +UCLIBC_HAS_FENV=y +UCLIBC_HAS_LONG_DOUBLE_MATH=y +KERNEL_HEADERS="/home/stephan/projects/OpenELEC/build.OpenELEC.enna.i386.uClibc.devel/linux-2.6.32-rc3/dest/include" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# ARCH_HAS_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +# LDSO_LDD_SUPPORT is not set +# LDSO_CACHE_SUPPORT is not set +# LDSO_PRELOAD_FILE_SUPPORT is not set +# UCLIBC_STATIC_LDCONFIG is not set +# LDSO_RUNPATH is not set +UCLIBC_CTOR_DTOR=y +# LDSO_GNU_HASH_SUPPORT is not set +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +# UCLIBC_HAS_THREADS_NATIVE is not set +UCLIBC_HAS_SYSLOG=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +# MALLOC_GLIBC_COMPAT is not set +# UCLIBC_DYNAMIC_ATEXIT is not set +# COMPAT_ATEXIT is not set +UCLIBC_SUSV3_LEGACY=y +# UCLIBC_SUSV3_LEGACY_MACROS is not set +# UCLIBC_SUSV4_LEGACY is not set +# UCLIBC_HAS_STUBS is not set +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UCLIBC_HAS_PTY=y +# ASSUME_DEVPTS is not set +# UNIX98PTY_ONLY is not set +UCLIBC_HAS_GETPT=y +# UCLIBC_HAS_TM_EXTENSIONS is not set +# UCLIBC_HAS_TZ_CACHING is not set +UCLIBC_HAS_TZ_FILE=y +# UCLIBC_HAS_TZ_FILE_READ_MANY is not set +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Advanced Library Settings +# +UCLIBC_PWD_BUFFER_SIZE=256 +UCLIBC_GRP_BUFFER_SIZE=256 + +# +# Support various families of functions +# +UCLIBC_LINUX_MODULE_24=y +UCLIBC_LINUX_SPECIFIC=y +UCLIBC_HAS_GNU_ERROR=y +UCLIBC_BSD_SPECIFIC=y +UCLIBC_HAS_BSD_ERR=y +# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set +# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set +# UCLIBC_NTP_LEGACY is not set +# UCLIBC_SV4_DEPRECATED is not set +UCLIBC_HAS_REALTIME=y +UCLIBC_HAS_ADVANCED_REALTIME=y +UCLIBC_HAS_EPOLL=y +UCLIBC_HAS_XATTR=y +UCLIBC_HAS_PROFILING=y +UCLIBC_HAS_CRYPT_IMPL=y +UCLIBC_HAS_CRYPT=y +UCLIBC_HAS_NETWORK_SUPPORT=y +UCLIBC_HAS_SOCKET=y +UCLIBC_HAS_IPV4=y +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +# UCLIBC_HAS_FULL_RPC is not set +# UCLIBC_HAS_REENTRANT_RPC is not set +# UCLIBC_USE_NETLINK is not set +# UCLIBC_HAS_BSD_RES_CLOSE is not set +UCLIBC_HAS_COMPAT_RES_STATE=y +# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set +UCLIBC_HAS_RESOLV_STUB=y + +# +# String and Stdio Support +# +# UCLIBC_HAS_STRING_GENERIC_OPT is not set +# UCLIBC_HAS_STRING_ARCH_OPT is not set +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set +# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +# UCLIBC_HAS_PRINTF_M_SPEC is not set +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +# UCLIBC_HAS_SIGNUM_MESSAGES is not set +UCLIBC_HAS_GNU_GETOPT=y +# UCLIBC_HAS_GNU_GETSUBOPT is not set + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +# UCLIBC_HAS_WORDEXP is not set +# UCLIBC_HAS_FTW is not set +UCLIBC_HAS_GLOB=y +UCLIBC_HAS_GNU_GLOB=y + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="/usr" +HARDWIRED_ABSPATH=y + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +# UCLIBC_BUILD_RELRO is not set +# UCLIBC_BUILD_NOW is not set +# UCLIBC_BUILD_NOEXECSTACK is not set + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +UCLIBC_MALLOC_DEBUGGING=y +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set diff --git a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf index d181faa44d..250e27bd22 100644 --- a/packages/toolchain/devel/uClibc/config/uClibc.i386.conf +++ b/packages/toolchain/devel/uClibc/config/uClibc.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Version: 0.9.30.1 +# Version: 0.9.30-git # # TARGET_alpha is not set # TARGET_arm is not set @@ -67,7 +67,7 @@ UCLIBC_HAS_FPU=y DO_C99_MATH=y UCLIBC_HAS_FENV=y UCLIBC_HAS_LONG_DOUBLE_MATH=y -KERNEL_HEADERS="" +KERNEL_HEADERS=" " HAVE_DOT_CONFIG=y # @@ -90,6 +90,7 @@ UCLIBC_CTOR_DTOR=y UCLIBC_HAS_THREADS=y PTHREADS_DEBUG_SUPPORT=y LINUXTHREADS_OLD=y +# UCLIBC_HAS_THREADS_NATIVE is not set UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y # MALLOC is not set @@ -100,6 +101,7 @@ MALLOC_STANDARD=y # COMPAT_ATEXIT is not set UCLIBC_SUSV3_LEGACY=y # UCLIBC_SUSV3_LEGACY_MACROS is not set +UCLIBC_SUSV4_LEGACY=y # UCLIBC_HAS_STUBS is not set UCLIBC_HAS_SHADOW=y UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y @@ -148,6 +150,9 @@ UCLIBC_HAS_RPC=y # UCLIBC_HAS_REENTRANT_RPC is not set # UCLIBC_USE_NETLINK is not set # UCLIBC_HAS_BSD_RES_CLOSE is not set +UCLIBC_HAS_COMPAT_RES_STATE=y +# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set +UCLIBC_HAS_RESOLV_STUB=y # # String and Stdio Support @@ -161,10 +166,7 @@ UCLIBC_HAS_CTYPE_CHECKED=y # UCLIBC_HAS_CTYPE_ENFORCED is not set UCLIBC_HAS_WCHAR=y # UCLIBC_HAS_LOCALE is not set -# UCLIBC_PREGENERATED_LOCALE_DATA is not set -# UCLIBC_HAS_XLOCALE is not set # UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set # UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 # UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set @@ -200,6 +202,7 @@ UCLIBC_HAS_REGEX_OLD=y UCLIBC_HAS_FNMATCH=y UCLIBC_HAS_FNMATCH_OLD=y # UCLIBC_HAS_WORDEXP is not set +# UCLIBC_HAS_NFTW is not set # UCLIBC_HAS_FTW is not set UCLIBC_HAS_GLOB=y UCLIBC_HAS_GNU_GLOB=y @@ -210,6 +213,7 @@ UCLIBC_HAS_GNU_GLOB=y SHARED_LIB_LOADER_PREFIX="$(DEVEL_PREFIX)/lib" RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr" +HARDWIRED_ABSPATH=y # # Security options diff --git a/packages/toolchain/devel/uClibc/install b/packages/toolchain/devel/uClibc/install index 6d1d4fdfe2..c20e47fb12 100755 --- a/packages/toolchain/devel/uClibc/install +++ b/packages/toolchain/devel/uClibc/install @@ -32,8 +32,7 @@ [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libcrypt.so.0 $INSTALL/lib [ "$NETWORK" = yes ] && cp $PKG_BUILD/lib/libresolv.so.0 $INSTALL/lib - [ "$DEVTOOLS" = yes ] && \ - mkdir -p $INSTALL/bin && \ + [ "$DEVTOOLS" = yes ] && mkdir -p $INSTALL/bin && \ cp $PKG_BUILD/utils/ldd $INSTALL/bin [ -n "$TIMEZONE" ] && mkdir -p $INSTALL/etc && echo -n "$TIMEZONE" > $INSTALL/etc/TZ diff --git a/packages/toolchain/devel/uClibc/patches/12_gen_bits_syscall_h.diff b/packages/toolchain/devel/uClibc/patches/12_gen_bits_syscall_h.diff deleted file mode 100644 index 195297c361..0000000000 --- a/packages/toolchain/devel/uClibc/patches/12_gen_bits_syscall_h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- uClibc.orig/Makefile.in 2008-09-02 14:51:27.000000000 +0200 -+++ uClibc/Makefile.in 2008-09-02 14:51:42.000000000 +0200 -@@ -145,7 +145,7 @@ - cd $(top_builddir); \ - tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \ - [ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \ -- KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \ -+ KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(HOSTCC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \ - if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \ - $(RM) $$tmp; \ - else \ diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_rpmatch.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_rpmatch.diff deleted file mode 100644 index 86d7c254f7..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_rpmatch.diff +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur uClibc-0.9.30.1/libc/stdlib/Makefile.in uClibc-0.9.30.1.patch/libc/stdlib/Makefile.in ---- uClibc-0.9.30.1/libc/stdlib/Makefile.in 2008-11-07 22:15:53.000000000 +0100 -+++ uClibc-0.9.30.1.patch/libc/stdlib/Makefile.in 2009-09-26 21:02:10.972572307 +0200 -@@ -14,7 +14,7 @@ - rand.c random.c random_r.c setenv.c system.c div.c ldiv.c lldiv.c \ - getpt.c drand48-iter.c jrand48.c \ - jrand48_r.c lrand48.c lrand48_r.c mrand48.c mrand48_r.c nrand48.c \ -- nrand48_r.c rand_r.c srand48.c srand48_r.c seed48.c seed48_r.c \ -+ nrand48_r.c rand_r.c rpmatch.c srand48.c srand48_r.c seed48.c seed48_r.c \ - valloc.c a64l.c l64a.c __uc_malloc.c - ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y) - CSRC += posix_memalign.c -diff -Naur uClibc-0.9.30.1/libc/stdlib/rpmatch.c uClibc-0.9.30.1.patch/libc/stdlib/rpmatch.c ---- uClibc-0.9.30.1/libc/stdlib/rpmatch.c 1970-01-01 01:00:00.000000000 +0100 -+++ uClibc-0.9.30.1.patch/libc/stdlib/rpmatch.c 2003-06-12 00:12:19.000000000 +0200 -@@ -0,0 +1,64 @@ -+/* Determine whether string value is affirmation or negative response -+ according to current locale's data. -+ This file is part of the GNU C Library. -+ Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#include -+#include -+#include -+ -+ -+int -+rpmatch (response) -+ const char *response; -+{ -+ /* Match against one of the response patterns, compiling the pattern -+ first if necessary. */ -+ auto int try (const int tag, const int match, const int nomatch, -+ const char **lastp, regex_t *re); -+ -+ int try (const int tag, const int match, const int nomatch, -+ const char **lastp, regex_t *re) -+ { -+ const char *pattern = nl_langinfo (tag); -+ if (pattern != *lastp) -+ { -+ /* The pattern has changed. */ -+ if (*lastp) -+ { -+ /* Free the old compiled pattern. */ -+ __regfree (re); -+ *lastp = NULL; -+ } -+ /* Compile the pattern and cache it for future runs. */ -+ if (__regcomp (re, pattern, REG_EXTENDED) != 0) -+ return -1; -+ *lastp = pattern; -+ } -+ -+ /* Try the pattern. */ -+ return __regexec (re, response, 0, NULL, 0) == 0 ? match : nomatch; -+ } -+ -+ /* We cache the response patterns and compiled regexps here. */ -+ static const char *yesexpr, *noexpr; -+ static regex_t yesre, nore; -+ -+ return (try (YESEXPR, 1, 0, &yesexpr, &yesre) ?: -+ try (NOEXPR, 0, -1, &noexpr, &nore)); -+} diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_timerfd.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_timerfd.diff deleted file mode 100644 index 598b16dc2f..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.1-add_timerfd.diff +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in -index fbb5729..788571e 100644 ---- a/libc/sysdeps/linux/common/Makefile.in -+++ b/libc/sysdeps/linux/common/Makefile.in -@@ -31,7 +31,7 @@ CSRC := $(filter-out capget.c capset.c inotify.c ioperm.c iopl.c madvise.c \ - remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \ - sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \ - splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \ -- sync_file_range.c sysctl.c sysinfo.c uselib.c vhangup.c,$(CSRC)) -+ sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c,$(CSRC)) - endif - - ifneq ($(UCLIBC_BSD_SPECIFIC),y) -diff --git a/libc/sysdeps/linux/common/sys/timerfd.h b/libc/sysdeps/linux/common/sys/timerfd.h -new file mode 100644 -index 0000000..c1bb06f ---- a/dev/null -+++ b/libc/sysdeps/linux/common/sys/timerfd.h -@@ -0,0 +1,60 @@ -+/* Copyright (C) 2008 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 -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, write to the Free -+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -+ 02111-1307 USA. */ -+ -+#ifndef _SYS_TIMERFD_H -+#define _SYS_TIMERFD_H 1 -+ -+#include -+ -+ -+/* Bits to be set in the FLAGS parameter of `timerfd_create'. */ -+enum -+ { -+ TFD_CLOEXEC = 02000000, -+#define TFD_CLOEXEC TFD_CLOEXEC -+ TFD_NONBLOCK = 04000 -+#define TFD_NONBLOCK TFD_NONBLOCK -+ }; -+ -+ -+/* Bits to be set in the FLAGS parameter of `timerfd_settime'. */ -+enum -+ { -+ TFD_TIMER_ABSTIME = 1 << 0 -+#define TFD_TIMER_ABSTIME TFD_TIMER_ABSTIME -+ }; -+ -+ -+__BEGIN_DECLS -+ -+/* Return file descriptor for new interval timer source. */ -+extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; -+ -+/* Set next expiration time of interval timer source UFD to UTMR. If -+ FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is -+ absolute. Optionally return the old expiration time in OTMR. */ -+extern int timerfd_settime (int __ufd, int __flags, -+ __const struct itimerspec *__utmr, -+ struct itimerspec *__otmr) __THROW; -+ -+/* Return the next expiration time of UFD. */ -+extern int timerfd_gettime (int __ufd, struct itimerspec *__otmr) __THROW; -+ -+__END_DECLS -+ -+#endif /* sys/timerfd.h */ -diff --git a/libc/sysdeps/linux/common/timerfd.c b/libc/sysdeps/linux/common/timerfd.c -new file mode 100644 -index 0000000..2332044 ---- a/dev/null -+++ b/libc/sysdeps/linux/common/timerfd.c -@@ -0,0 +1,32 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * timerfd_create() / timerfd_settime() / timerfd_gettime() for uClibc -+ * -+ * Copyright (C) 2009 Stephan Raue -+ * -+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -+ */ -+ -+#include -+#include -+ -+/* -+ * timerfd_create() -+ */ -+#ifdef __NR_timerfd_create -+_syscall2(int, timerfd_create, int, clockid, int, flags) -+#endif -+ -+/* -+ * timerfd_settime() -+ */ -+#ifdef __NR_timerfd_settime -+_syscall4(int,timerfd_settime, int, ufd, int, flags, const struct itimerspec *, utmr, struct itimerspec *, otmr) -+#endif -+ -+/* -+ * timerfd_gettime() -+ */ -+#ifdef __NR_timerfd_gettime -+_syscall2(int, timerfd_gettime, int, ufd, struct itimerspec *, otmr) -+#endif --- -cgit v0.8.2.1 diff --git a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff b/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff deleted file mode 100644 index 4dc8f9ae05..0000000000 --- a/packages/toolchain/devel/uClibc/patches/uClibc-0.9.30.2-20091017_fix.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff -Naur uClibc-0.9.30.2-20091017/libc/string/strlcpy.c uClibc-0.9.30.2-20091017.patch/libc/string/strlcpy.c ---- uClibc-0.9.30.2-20091017/libc/string/strlcpy.c 2009-10-16 11:41:34.000000000 +0200 -+++ uClibc-0.9.30.2-20091017.patch/libc/string/strlcpy.c 2009-10-19 00:01:37.991090010 +0200 -@@ -59,6 +59,5 @@ - #else - #ifndef __UCLIBC_HAS_LOCALE__ - strong_alias(__wcslcpy,wcsxfrm) --libc_hidden_def(wcsxfrm) - #endif - #endif diff --git a/packages/toolchain/devel/uClibc/unpack b/packages/toolchain/devel/uClibc/unpack index b0cb2ab53f..a4029fcc4a 100755 --- a/packages/toolchain/devel/uClibc/unpack +++ b/packages/toolchain/devel/uClibc/unpack @@ -17,7 +17,7 @@ echo 'CFLAGS+=-isystem $(shell $(CC) -print-file-name=include-fixed)' >> $UCLIBC sed -e "s%^KERNEL_HEADERS=.*%KERNEL_HEADERS=\"$(kernel_path)/dest/include\"%" \ $PKG_DIR/config/$1.$TARGET_ARCH.conf > $UCLIBC/.config -[ "$DEVTOOLS" = yes ] && cat $PKG_DIR/config/$1.devtools.conf >> $UCLIBC/.config +[ "$DEBUG" = yes ] && cat $PKG_DIR/config/$1.debug.conf >> $UCLIBC/.config make -C $UCLIBC oldconfig -make -C $UCLIBC pregen +make -C $UCLIBC headers diff --git a/packages/toolchain/devel/uClibc/url b/packages/toolchain/devel/uClibc/url index eaba0af9b0..131646bc5b 100644 --- a/packages/toolchain/devel/uClibc/url +++ b/packages/toolchain/devel/uClibc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/uClibc-0.9.30.2-20091017.tar.bz2 \ No newline at end of file +http://sources.openelec.tv/svn/uClibc-0.9.30.2-20091030.tar.bz2 \ No newline at end of file