From 67d63649893cfcb636f5f01e4545c7f260a5dd07 Mon Sep 17 00:00:00 2001 From: Marc Andre Tanner Date: Sat, 16 Jan 2010 17:55:39 +0100 Subject: [PATCH] uclibc: update to v0.9.30.2 Signed-off-by: Marc Andre Tanner --- download.sh | 4 +-- .../patches/uClibc-fix-unifdef-compilation.patch | 29 ---------------------- sources/patches/uClibc-fix-utils-build.patch | 23 +++++++++-------- 3 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 sources/patches/uClibc-fix-unifdef-compilation.patch rewrite sources/patches/uClibc-fix-utils-build.patch (98%) diff --git a/download.sh b/download.sh index 1c14cc5..924f293 100755 --- a/download.sh +++ b/download.sh @@ -24,8 +24,8 @@ SHA1= \ RENAME="s/.*h=(.*);.*/kernel-\1.tar.gz/" \ download || dienow -URL=http://www.uclibc.org/downloads/uClibc-0.9.30.1.tar.bz2 \ -SHA1=4b36fec9a0dacbd6fe0fd2cdb7836aaf8b7f4992 \ +URL=http://www.uclibc.org/downloads/uClibc-0.9.30.2.tar.bz2 \ +SHA1=a956b1c37e3163c961dad7fdf96b6d4c7e176d1f \ download || dienow URL=http://www.busybox.net/downloads/busybox-1.15.2.tar.bz2 \ diff --git a/sources/patches/uClibc-fix-unifdef-compilation.patch b/sources/patches/uClibc-fix-unifdef-compilation.patch deleted file mode 100644 index 5b3e1fb..0000000 --- a/sources/patches/uClibc-fix-unifdef-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- uClibc/extra/scripts/unifdef.c 2008-04-28 01:10:00.000000000 +0200 -+++ uClibc-working/extra/scripts/unifdef.c 2009-11-13 15:02:29.000000000 +0100 -@@ -206,7 +206,7 @@ - static void error(const char *); - static int findsym(const char *); - static void flushline(bool); --static Linetype getline(void); -+static Linetype get_line(void); - static Linetype ifeval(const char **); - static void ignoreoff(void); - static void ignoreon(void); -@@ -512,7 +512,7 @@ - - for (;;) { - linenum++; -- lineval = getline(); -+ lineval = get_line(); - trans_table[ifstate[depth]][lineval](); - debug("process %s -> %s depth %d", - linetype_name[lineval], -@@ -526,7 +526,7 @@ - * help from skipcomment(). - */ - static Linetype --getline(void) -+get_line(void) - { - const char *cp; - int cursym; diff --git a/sources/patches/uClibc-fix-utils-build.patch b/sources/patches/uClibc-fix-utils-build.patch dissimilarity index 98% index 32e3630..8d62c82 100644 --- a/sources/patches/uClibc-fix-utils-build.patch +++ b/sources/patches/uClibc-fix-utils-build.patch @@ -1,11 +1,12 @@ ---- uClibc/utils/Makefile.in 2009-01-14 16:54:12.000000000 +0100 -+++ uClibc-working/utils/Makefile.in 2009-11-11 22:53:41.000000000 +0100 -@@ -5,7 +5,7 @@ - # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. - # - --CFLAGS-utils := -DNOT_IN_libc $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib -+CFLAGS-utils := -DNOT_IN_libc $(SSP_ALL_CFLAGS) -B$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib -L$(top_builddir)lib - - CFLAGS-utils-common := -I$(top_srcdir)ldso/include -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=$(UCLIBC_LDSO) - CFLAGS-utils-shared := +--- uClibc/utils/Makefile.in 2010-01-13 22:22:31.000000000 +0100 ++++ uClibc-working/utils/Makefile.in 2010-01-16 17:35:33.000000000 +0100 +@@ -16,7 +16,8 @@ + -I$(top_srcdir)/$(KERNEL_HEADERS) \ + -DNOT_IN_libc \ + -B$(top_builddir)lib \ +- -Wl,-rpath-link,$(top_builddir)lib ++ -Wl,-rpath-link,$(top_builddir)lib \ ++ -L$(top_builddir)lib + + ifeq ($(UCLIBC_BUILD_PIE),y) + CFLAGS-utils-shared := $(PIEFLAG) $(LDPIEFLAG) -- 2.11.4.GIT