Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.9/250-resolv-dynamic.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
parent 1201 c9967a6e3b25
permissions -rw-r--r--
libc/uClibc: fix building on system with recent glibc

While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:

[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'

The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)

[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771) 
     1 Original patch from: gentoo/src/patchsets/glibc/2.9/1055_all_glibc-resolv-dynamic.patch

     2 

     3 -= BEGIN original header =-

     4 ripped from SuSE

     5 

     6 if /etc/resolv.conf is updated, then make sure applications

     7 already running get the updated information.

     8 

     9 http://bugs.gentoo.org/177416

    10 

    11 -= END original header =-

    12 

    13 diff -durN glibc-2_9.orig/resolv/res_libc.c glibc-2_9/resolv/res_libc.c

    14 --- glibc-2_9.orig/resolv/res_libc.c	2006-10-11 10:59:28.000000000 +0200

    15 +++ glibc-2_9/resolv/res_libc.c	2009-02-02 22:00:57.000000000 +0100

    16 @@ -22,6 +22,7 @@

    17  #include <arpa/nameser.h>

    18  #include <resolv.h>

    19  #include <bits/libc-lock.h>

    20 +#include <sys/stat.h>

    21  

    22  

    23  /* The following bit is copied from res_data.c (where it is #ifdef'ed

    24 @@ -95,6 +96,20 @@

    25  __res_maybe_init (res_state resp, int preinit)

    26  {

    27  	if (resp->options & RES_INIT) {

    28 +		static time_t last_mtime, last_check;

    29 +		time_t now;

    30 +		struct stat statbuf;

    31 +		

    32 +		time (&now);

    33 +		if (now != last_check) {

    34 +			last_check = now;

    35 +			if (stat (_PATH_RESCONF, &statbuf) == 0 && last_mtime != statbuf.st_mtime) {

    36 +				last_mtime = statbuf.st_mtime;

    37 +				atomicinclock (lock);

    38 +				atomicinc (__res_initstamp);

    39 +				atomicincunlock (lock);

    40 +			}

    41 +		}

    42  		if (__res_initstamp != resp->_u._ext.initstamp) {

    43  			if (resp->nscount > 0) {

    44  				__res_iclose (resp, true);
crosstool-ng