Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.1.3/rh62-99-glibc-2.1.3-allow-gcc-3.4-gconv_stubs.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Jul 28 21:34:41 2007 +0000 (2007-07-28)
changeset 301 2be7232a73ac
permissions -rw-r--r--
Bump version to 0.2.2. 
     1 "Fixes" gcc-3.4.0 errors:

     2 gconv_stubs.c:49: error: conflicting types for '__gconv_close_transform'

     3 ../iconv/gconv_int.h:131: error: previous declaration of '__gconv_close_transform' was here

     4 gconv_stubs.c:49: error: conflicting types for '__gconv_close_transform'

     5 ../iconv/gconv_int.h:131: error: previous declaration of '__gconv_close_transform' was here

     6 gconv_stubs.c:52: error: conflicting types for '__gconv'

     7 ../iconv/gconv_int.h:112: error: previous declaration of '__gconv' was here

     8 gconv_stubs.c:52: error: conflicting types for '__gconv'

     9 ../iconv/gconv_int.h:112: error: previous declaration of '__gconv' was here

    10 gconv_stubs.c:54: error: conflicting types for '__gconv_find_transform'

    11 ../iconv/gconv_int.h:119: error: previous declaration of '__gconv_find_transform' was here

    12 gconv_stubs.c:54: error: conflicting types for '__gconv_find_transform'

    13 ../iconv/gconv_int.h:119: error: previous declaration of '__gconv_find_transform' was here

    14 gconv_stubs.c:56: error: conflicting types for '__gconv_open'

    15 ../iconv/gconv_int.h:99: error: previous declaration of '__gconv_open' was here

    16 gconv_stubs.c:56: error: conflicting types for '__gconv_open'

    17 ../iconv/gconv_int.h:99: error: previous declaration of '__gconv_open' was here

    18 make[2]: *** [/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.1.3/build-glibc/c_stubs/gconv_stubs.o] Error 1

    19 make[2]: Leaving directory `/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.1.3/glibc-2.1.3/c_stubs'

    20 

    21 although the right thing would probably be to declare the 

    22 stubs to have the right attributes.

    23 

    24 --- glibc-2.1.3/c_stubs/gconv_stubs.c.old	Sun Apr 11 20:25:09 2004

    25 +++ glibc-2.1.3/c_stubs/gconv_stubs.c	Sun Apr 11 20:29:35 2004

    26 @@ -18,7 +18,18 @@

    27     Boston, MA 02111-1307, USA.  */

    28  

    29  #include <features.h>

    30 +

    31 +/* strange hack workaround for gcc-3.4.0.  Might be a better way. */

    32 +#define __gconv_close_transform foo__gconv_close_transform

    33 +#define __gconv foo__gconv

    34 +#define __gconv_find_transform foo__gconv_find_transform

    35 +#define __gconv_open foo__gconv_open

    36 +

    37  #include <gconv_int.h>

    38 +#undef __gconv_close_transform

    39 +#undef __gconv

    40 +#undef __gconv_find_transform

    41 +#undef __gconv_open

    42  

    43  /* hack for self identification */

    44  int __c_stubs_is_compiled_in;
crosstool-ng