From 1d7653a4040c77cc803a5e0cb5aebc824a66d58b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 29 Jan 2008 23:27:41 +0000 Subject: glibc 2.5, 2.6.1: * check for updated resolv.conf before a nameserver call (see debian bug #272265) * remove bogus executable attribute for patch * clean up ugly mixing of tabs and spaces --- .../files/glibc-2.5-local-dynamic-resolvconf.patch | 44 ++++++++++++ .../glibc-2.5-soft-fp-separate-strong-alias.patch | 0 packages/glibc/glibc_2.5.bb | 83 ++++++++++------------ packages/glibc/glibc_2.6.1.bb | 73 +++++++++---------- 4 files changed, 115 insertions(+), 85 deletions(-) create mode 100644 packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch mode change 100755 => 100644 packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch (limited to 'packages/glibc') diff --git a/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch new file mode 100644 index 0000000000..bab3747b1a --- /dev/null +++ b/packages/glibc/files/glibc-2.5-local-dynamic-resolvconf.patch @@ -0,0 +1,44 @@ +--- glibc-2.5.orig/debian/patches/any/local-dynamic-resolvconf.diff ++++ glibc-2.5/debian/patches/any/local-dynamic-resolvconf.diff +@@ -0,0 +1,41 @@ ++# All lines beginning with `# DP:' are a description of the patch. ++# DP: Description: allow dynamic long-running processes to ++# DP: re-read a dynamically updated resolv.conf on the fly ++# DP: Dpatch author: Adam Conrad ++# DP: Patch author: Thorsten Kukuk ++# DP: Upstream status: Ubuntu-Specific ++# DP: Date: 2006-01-13 08:14:21 UTC ++ ++Index: resolv/res_libc.c ++=================================================================== ++--- resolv/res_libc.c.orig +++++ resolv/res_libc.c ++@@ -22,7 +22,7 @@ ++ #include ++ #include ++ #include ++- +++#include ++ ++ /* The following bit is copied from res_data.c (where it is #ifdef'ed ++ out) since res_init() should go into libc.so but the rest of that ++@@ -94,8 +94,17 @@ ++ int ++ __res_maybe_init (res_state resp, int preinit) ++ { ++- if (resp->options & RES_INIT) { ++- if (__res_initstamp != resp->_u._ext.initstamp) { +++ static time_t last_mtime; +++ struct stat statbuf; +++ int ret; +++ +++ +++ if (resp->options & RES_INIT) { +++ ret = stat (_PATH_RESCONF, &statbuf); +++ if (__res_initstamp != resp->_u._ext.initstamp +++ || (ret == 0) && (last_mtime != statbuf.st_mtime)) +++ { +++ last_mtime = statbuf.st_mtime; ++ if (resp->nscount > 0) { ++ __res_iclose (resp, true); ++ return __res_vinit (resp, 1); diff --git a/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch b/packages/glibc/files/glibc-2.5-soft-fp-separate-strong-alias.patch old mode 100755 new mode 100644 diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index e30d357121..f50c85b1d0 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,17 +1,15 @@ require glibc.inc +PR = "r9" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r8" - # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" - FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-2.4" GLIBC_ADDONS ?= "ports,nptl,libidn" @@ -36,57 +34,52 @@ python __anonymous () { RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -# file://noinfo.patch;patch=1 -# file://ldconfig.patch;patch=1;pnum=0 -# file://arm-machine-gmon.patch;patch=1;pnum=0 \ -# \ -# file://arm-ioperm.patch;patch=1;pnum=0 \ -# file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ - file://arm-memcpy.patch;patch=1 \ - file://arm-longlong.patch;patch=1 \ - file://fhs-linux-paths.patch;patch=1 \ - file://dl-cache-libcmp.patch;patch=1 \ - file://ldsocache-varrun.patch;patch=1 \ - file://nptl-crosscompile.patch;patch=1 \ - file://glibc-check_pf.patch;patch=1;pnum=0 \ -# file://glibc-2.4-compile.patch;patch=1 \ -# file://glibc-2.4-openat-3.patch;patch=1 \ -# file://fixup-aeabi-syscalls.patch;patch=1 \ - file://zecke-sane-readelf.patch;patch=1 \ - file://ldd-unbash.patch;patch=1 \ - file://generic-bits_select.h \ - file://generic-bits_types.h \ - file://generic-bits_typesizes.h \ - file://generic-bits_time.h \ - file://etc/ld.so.conf \ - file://generate-supported.mk" - +SRC_URI = "\ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ +" # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" -#powerpc patches to add support for soft-float -SRC_URI_append_powerpc= " file://ppc-sfp-machine.patch;patch=1 \ - file://ppc-soft-fp-20070115.patch;patch=1 \ - file://ppc-ld-nofpu-20070104.patch;patch=1 \ - file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ - file://powerpc-sqrt-hack.diff;patch=1 \ - file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1" +# Powerpc patches to add support for soft-float +SRC_URI_append_powerpc = " file://ppc-sfp-machine.patch;patch=1 \ + file://ppc-soft-fp-20070115.patch;patch=1 \ + file://ppc-ld-nofpu-20070104.patch;patch=1 \ + file://ppc-ports-ld-nofpu-20070114.patch;patch=1 \ + file://powerpc-sqrt-hack.diff;patch=1 \ + file://glibc-2.5-soft-fp-separate-strong-alias.patch;patch=1" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons=${GLIBC_ADDONS} \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - ${GLIBC_EXTRA_OECONF}" +EXTRA_OECONF = "\ + --enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF} \ +" EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 46b56a0a65..d2816f83b1 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,12 +1,11 @@ require glibc.inc +PR = "r2" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" RPROVIDES_${PN}-dev = "libc6-dev" -PR = "r1" - # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" @@ -36,53 +35,47 @@ python __anonymous () { RDEPENDS_${PN}-dev = "linux-libc-headers-dev" -# file://noinfo.patch;patch=1 -# file://ldconfig.patch;patch=1;pnum=0 -# file://arm-machine-gmon.patch;patch=1;pnum=0 \ -# \ -# file://arm-ioperm.patch;patch=1;pnum=0 \ -# file://ldd.patch;patch=1;pnum=0 \ -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ - ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ - file://arm-memcpy.patch;patch=1 \ - file://arm-longlong.patch;patch=1 \ - file://fhs-linux-paths.patch;patch=1 \ - file://dl-cache-libcmp.patch;patch=1 \ - file://ldsocache-varrun.patch;patch=1 \ - file://nptl-crosscompile.patch;patch=1 \ - file://glibc-check_pf.patch;patch=1;pnum=0 \ -# file://glibc-2.4-compile.patch;patch=1 \ -# file://glibc-2.4-openat-3.patch;patch=1 \ -# file://fixup-aeabi-syscalls.patch;patch=1 \ - file://zecke-sane-readelf.patch;patch=1 \ - file://ldd-unbash.patch;patch=1 \ - file://generic-bits_select.h \ - file://generic-bits_types.h \ - file://generic-bits_typesizes.h \ - file://generic-bits_time.h \ - file://etc/ld.so.conf \ - file://generate-supported.mk" - +SRC_URI = "\ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \ + ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \ + file://arm-memcpy.patch;patch=1 \ + file://arm-longlong.patch;patch=1 \ + file://fhs-linux-paths.patch;patch=1 \ + file://dl-cache-libcmp.patch;patch=1 \ + file://ldsocache-varrun.patch;patch=1 \ + file://nptl-crosscompile.patch;patch=1 \ + file://glibc-2.5-local-dynamic-resolvconf.patch;patch=1 \ + file://glibc-check_pf.patch;patch=1;pnum=0 \ + file://zecke-sane-readelf.patch;patch=1 \ + file://ldd-unbash.patch;patch=1 \ + file://generic-bits_select.h \ + file://generic-bits_types.h \ + file://generic-bits_typesizes.h \ + file://generic-bits_time.h \ + file://etc/ld.so.conf \ + file://generate-supported.mk \ +" # Build fails on sh3 and sh4 without additional patches SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1" SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1" -#powerpc patches to add support for soft-float -SRC_URI_append_powerpc= " \ - file://powerpc-sqrt-hack.diff;patch=1"" +# PowerPC Patches to add support for soft-float +SRC_URI_append_powerpc = "file://powerpc-sqrt-hack.diff;patch=1" S = "${WORKDIR}/glibc-${PV}" B = "${WORKDIR}/build-${TARGET_SYS}" -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons=${GLIBC_ADDONS} \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - ${GLIBC_EXTRA_OECONF}" +EXTRA_OECONF = "\ + --enable-kernel=${OLDEST_KERNEL} \ + --without-cvs --disable-profile --disable-debug --without-gd \ + --enable-clocale=gnu \ + --enable-add-ons=${GLIBC_ADDONS} \ + --with-headers=${STAGING_INCDIR} \ + --without-selinux \ + ${GLIBC_EXTRA_OECONF} \ +" EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}" -- cgit v1.2.3