From 06ae330bf4ad8aa68adfffc95bd8535e02476112 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 26 May 2009 14:58:32 +0000 Subject: [PATCH] [toolchain] add support for glibc-2.4 (#5213) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16089 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- toolchain/glibc-ports/patches/2.4/100-mips-fork.patch | 7 +++++++ toolchain/glibc/Config.in | 3 +++ toolchain/glibc/Config.version | 2 ++ toolchain/glibc/Makefile | 3 +++ 4 files changed, 15 insertions(+) create mode 100644 toolchain/glibc-ports/patches/2.4/100-mips-fork.patch diff --git a/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch b/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch new file mode 100644 index 000000000..8d53f41f1 --- /dev/null +++ b/toolchain/glibc-ports/patches/2.4/100-mips-fork.patch @@ -0,0 +1,7 @@ +diff --exclude=.svn -pNur glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c +--- glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2009-02-09 15:13:14.996030533 +0100 ++++ glibc-ports-2.4/sysdeps/unix/sysv/linux/mips/nptl/fork.c 2009-02-09 15:13:34.402489340 +0100 +@@ -1 +1,2 @@ +-#include "../i386/fork.c" ++#include ++ diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in index e1bffdab2..67ee72975 100644 --- a/toolchain/glibc/Config.in +++ b/toolchain/glibc/Config.in @@ -8,6 +8,9 @@ choice config GLIBC_VERSION_2_3_6 bool "glibc 2.3.6" + config GLIBC_VERSION_2_4 + bool "glibc 2.4" + config GLIBC_VERSION_2_6_1 bool "glibc 2.6.1" diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version index 1debf0c04..93ea3c316 100644 --- a/toolchain/glibc/Config.version +++ b/toolchain/glibc/Config.version @@ -2,6 +2,7 @@ config GLIBC_VERSION string depends on USE_GLIBC default "2.3.6" if GLIBC_VERSION_2_3_6 + default "2.4" if GLIBC_VERSION_2_4 default "2.6.1" if GLIBC_VERSION_2_6_1 default "2.7" if GLIBC_VERSION_2_7 default "2.7" @@ -10,6 +11,7 @@ config GLIBC_PORTS bool depends on USE_GLIBC default y if GLIBC_VERSION_2_3_6 && (arm || armeb || mips || mipsel || mips64 || mips64el) + default y if GLIBC_VERSION_2_4 && (arm || armeb || mips || mipsel || mips64 || mips64el) default y if GLIBC_VERSION_2_6_1 && (arm || armeb || mips || mipsel || mips64 || mips64el || powerpc) default y if GLIBC_VERSION_2_7 && (arm || armeb || mips || mipsel || mips64 || mips64el || powerpc) default n diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 229f20649..5d56d4b98 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -12,6 +12,9 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) ifeq ($(PKG_VERSION),2.3.6) PKG_MD5SUM:=bfdce99f82d6dbcb64b7f11c05d6bc96 endif +ifeq ($(PKG_VERSION),2.4) + PKG_MD5SUM:=7e9a88dcd41fbc53801dbe5bdacaf245 +endif ifeq ($(PKG_VERSION),2.6.1) PKG_MD5SUM:=11cf6d3fc86dbe0890b8d00372eb6286 endif