diff --git a/package/base/dietlibc/__i686-defined-hotfix.patch b/package/base/dietlibc/__i686-defined-hotfix.patch deleted file mode 100644 index 657b47dec..000000000 --- a/package/base/dietlibc/__i686-defined-hotfix.patch +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/__i686-defined-hotfix.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -taken from T2 trunk -2005-01-17 daja77 - -While optimizing for pentiumII, __i686 gets defined, resulting -in a compile error "junk at end of line"... - -- jsaw - ---- dietlibc-0.27/i386/PIC.h.orig 2004-12-12 00:41:23.957319464 +0100 -+++ dietlibc-0.27/i386/PIC.h 2004-12-12 01:04:36.086683632 +0100 -@@ -2,6 +2,8 @@ - #define __I386_PIC_H__ - #ifdef __DYN_LIB - -+#undef __i686 -+ - #if 1 - /* don't trash the athlon return stack */ - #if (__GNUC__ >= 3) // FIXME: how do I check for the binutils version ? diff --git a/package/base/dietlibc/dietlibc.desc b/package/base/dietlibc/dietlibc.desc index 5237739d1..7074c6b57 100644 --- a/package/base/dietlibc/dietlibc.desc +++ b/package/base/dietlibc/dietlibc.desc @@ -39,9 +39,9 @@ [L] GPL [S] Stable -[V] 0.27 +[V] 0.29 [P] X 01-3-----9 100.700 -[D] 3551932880 dietlibc-0.27.tar.bz2 http://www.kernel.org/pub/linux/libs/dietlibc/ +[D] 1167725729 dietlibc-0.29.tar.bz2 http://www.kernel.org/pub/linux/libs/dietlibc/ [D] 1283832747 sparc64-softfpu-dietlibc0.25-1.0.diff.bz2 http://www.rocklinux.net/people/fake/dietlibc/ diff --git a/package/base/dietlibc/stdio_h.patch b/package/base/dietlibc/stdio_h.patch deleted file mode 100644 index f6ac12c25..000000000 --- a/package/base/dietlibc/stdio_h.patch +++ /dev/null @@ -1,79 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/dietlibc/stdio_h.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -This is needed because a definition like: -"static FILE dummy;" -will not work because of: -"storage size of `dummy' isn't known" -and that can be found in coreutils ... - ---- ./dietstdio.h~ Fri Dec 13 21:23:43 2002 -+++ ./dietstdio.h Sat Apr 19 17:07:14 2003 -@@ -14,22 +14,6 @@ - #define BUFSIZE 2048 - #endif - --struct __stdio_file { -- int fd; -- int flags; -- unsigned int bs; /* read: bytes in buffer */ -- unsigned int bm; /* position in buffer */ -- unsigned int buflen; /* length of buf */ -- char *buf; -- struct __stdio_file *next; /* for fflush */ -- pid_t popen_kludge; -- unsigned char ungetbuf; -- char ungotten; --#ifdef WANT_THREAD_SAFE -- pthread_mutex_t m; --#endif --}; -- - #define ERRORINDICATOR 1 - #define EOFINDICATOR 2 - #define BUFINPUT 4 ---- ./include/stdio.h.orig Sat Apr 19 17:18:15 2003 -+++ ./include/stdio.h Sat Apr 19 17:20:18 2003 -@@ -5,6 +5,26 @@ - #include - #include - -+#ifndef _PTHREAD_H -+#include -+#endif -+ -+struct __stdio_file { -+ int fd; -+ int flags; -+ unsigned int bs; /* read: bytes in buffer */ -+ unsigned int bm; /* position in buffer */ -+ unsigned int buflen; /* length of buf */ -+ char *buf; -+ struct __stdio_file *next; /* for fflush */ -+ pid_t popen_kludge; -+ unsigned char ungetbuf; -+ char ungotten; -+#ifdef WANT_THREAD_SAFE -+ pthread_mutex_t m; -+#endif -+}; -+ - typedef struct __stdio_file FILE; - - FILE *fopen (const char *path, const char *mode) __THROW;