Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/ports-2.13/180-resolv-dynamic.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Wed Dec 14 16:55:22 2011 +0100 (2011-12-14)
branch1.13
changeset 2848 1ff89596dab0
permissions -rw-r--r--
libc/eglibc: fix localedef 2.14 build

The localedef of eglibc 2.14 requires NOT_IN_libc to be defined in order to
compile intl/l10nflist.c.

This is because localedef is built separately from eglibc and uses some parts of
eglibc that don't compile in standalone without this preprocessor definition.

This fixes the following error:

[ALL ] gcc -g -O2 -DNO_SYSCONF -DNO_UNCOMPRESS
-DLOCALE_PATH='"/usr/lib/locale:/usr/share/i18n"'
-DLOCALEDIR='"/usr/lib/locale"' -DLOCALE_ALIAS_PATH='"/usr/share/locale"'
-DCHARMAP_PATH='"/usr/share/i18n/charmaps"'
-DREPERTOIREMAP_PATH='"/usr/share/i18n/repertoiremaps"'
-DLOCSRCDIR='"/usr/share/i18n/locales"' -Iglibc/locale/programs -Iglibc/locale
-I/<snip>/.build/src/eglibc-localedef-2_14/include
-I/<snip>/.build/src/eglibc-localedef-2_14 -I.
-include /<snip>/.build/src/eglibc-localedef-2_14/include/always.h -Wall
-Wno-format -c -o locarchive.o glibc/locale/programs/locarchive.c
[ALL ] glibc/locale/programs/locarchive.c: In function 'enlarge_archive':
[ALL ] glibc/locale/programs/locarchive.c:303:21: warning: variable
'oldlocrectab' set but not used [-Wunused-but-set-variable]
[ALL ] In file included from glibc/locale/programs/locarchive.c:651:0:
[ALL ] glibc/locale/programs/../../intl/l10nflist.c: In function
'_nl_normalize_codeset':
[ERROR] glibc/locale/programs/../../intl/l10nflist.c:342:9: error:
'_nl_C_locobj_ptr' undeclared (first use in this function)
[ALL ] glibc/locale/programs/../../intl/l10nflist.c:342:9: note: each
undeclared identifier is reported only once for each function it appears in
[ALL ] glibc/locale/programs/locarchive.c: In function
'add_locales_to_archive':
[ALL ] glibc/locale/programs/locarchive.c:1450:7: warning: passing argument
1 of '__xpg_basename' discards 'const' qualifier from pointer target type
[enabled by default]
[ALL ] /usr/include/libgen.h:35:14: note: expected 'char *' but argument is
of type 'const char *'
[ERROR] make[1]: *** [locarchive.o] Error 1

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
(transplanted from 4cd9134739b594451794cf61a6e1b137422cdafd) 
     1 ripped from SuSE

     2 

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

     4 already running get the updated information.

     5 

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

     7 

     8 diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c

     9 --- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100

    10 +++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100

    11 @@ -22,6 +22,7 @@

    12  #include <arpa/nameser.h>

    13  #include <resolv.h>

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

    15 +#include <sys/stat.h>

    16  

    17  

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

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

    20  __res_maybe_init (res_state resp, int preinit)

    21  {

    22  	if (resp->options & RES_INIT) {

    23 +		static time_t last_mtime, last_check;

    24 +		time_t now;

    25 +		struct stat statbuf;

    26 +		

    27 +		time (&now);

    28 +		if (now != last_check) {

    29 +			last_check = now;

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

    31 +				last_mtime = statbuf.st_mtime;

    32 +				atomicinclock (lock);

    33 +				atomicinc (__res_initstamp);

    34 +				atomicincunlock (lock);

    35 +			}

    36 +		}

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

    38  			if (resp->nscount > 0)

    39  				__res_iclose (resp, true);
crosstool-ng