libidn/libidn.patch@9dacbd1d1aa2 (annotated)
libidn/libidn.patch
Fri, 07 Sep 2012 19:08:07 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Fri, 07 Sep 2012 19:08:07 +0200
- changeset 667
- 9dacbd1d1aa2
- permissions
- -rw-r--r--
Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.
| michael@564 | 1 | Index: configure |
| michael@564 | 2 | --- configure.orig 2012-05-23 10:36:44.000000000 +0200 |
| michael@564 | 3 | +++ configure 2012-05-29 09:37:30.000000000 +0200 |
| michael@564 | 4 | @@ -4984,10 +4984,7 @@ |
| michael@564 | 5 | if $ac_preproc_ok; then : |
| michael@564 | 6 | |
| michael@564 | 7 | else |
| michael@564 | 8 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
| michael@564 | 9 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
| michael@564 | 10 | -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
| michael@564 | 11 | -See \`config.log' for more details" "$LINENO" 5; } |
| michael@564 | 12 | + : |
| michael@564 | 13 | fi |
| michael@564 | 14 | |
| michael@564 | 15 | ac_ext=c |
| michael@564 | 16 | Index: contrib/doxygen/Doxyfile |
| michael@564 | 17 | Index: gl/error.c |
| michael@564 | 18 | --- gl/error.c.orig 2012-04-27 10:18:42.000000000 +0200 |
| michael@564 | 19 | +++ gl/error.c 2012-05-29 09:37:03.000000000 +0200 |
| michael@564 | 20 | @@ -28,7 +28,7 @@ |
| michael@564 | 21 | #include <stdlib.h> |
| michael@564 | 22 | #include <string.h> |
| michael@564 | 23 | |
| michael@564 | 24 | -#if !_LIBC && ENABLE_NLS |
| michael@564 | 25 | +#if !_LIBC && defined(ENABLE_NLS) |
| michael@564 | 26 | # include "gettext.h" |
| michael@564 | 27 | # define _(msgid) gettext (msgid) |
| michael@564 | 28 | #endif |
| michael@564 | 29 | Index: gl/gettext.h |
| michael@564 | 30 | --- gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 |
| michael@564 | 31 | +++ gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 |
| michael@564 | 32 | @@ -19,7 +19,7 @@ |
| michael@564 | 33 | #define _LIBGETTEXT_H 1 |
| michael@564 | 34 | |
| michael@564 | 35 | /* NLS can be disabled through the configure --disable-nls option. */ |
| michael@564 | 36 | -#if ENABLE_NLS |
| michael@564 | 37 | +#ifdef ENABLE_NLS |
| michael@564 | 38 | |
| michael@564 | 39 | /* Get declarations of GNU message catalog functions. */ |
| michael@564 | 40 | # include <libintl.h> |
| michael@564 | 41 | Index: lib/gl/gettext.h |
| michael@564 | 42 | --- lib/gl/gettext.h.orig 2012-04-27 10:18:42.000000000 +0200 |
| michael@564 | 43 | +++ lib/gl/gettext.h 2012-05-29 09:37:03.000000000 +0200 |
| michael@564 | 44 | @@ -19,7 +19,7 @@ |
| michael@564 | 45 | #define _LIBGETTEXT_H 1 |
| michael@564 | 46 | |
| michael@564 | 47 | /* NLS can be disabled through the configure --disable-nls option. */ |
| michael@564 | 48 | -#if ENABLE_NLS |
| michael@564 | 49 | +#ifdef ENABLE_NLS |
| michael@564 | 50 | |
| michael@564 | 51 | /* Get declarations of GNU message catalog functions. */ |
| michael@564 | 52 | # include <libintl.h> |
| michael@564 | 53 | Index: lib/gl/stdint.in.h |
| michael@564 | 54 | --- lib/gl/stdint.in.h.orig 2012-05-22 19:55:38.000000000 +0200 |
| michael@564 | 55 | +++ lib/gl/stdint.in.h 2012-05-29 09:37:03.000000000 +0200 |
| michael@564 | 56 | @@ -105,7 +105,7 @@ |
| michael@564 | 57 | # include <sys/inttypes.h> |
| michael@564 | 58 | #endif |
| michael@564 | 59 | |
| michael@564 | 60 | -#if @HAVE_SYS_BITYPES_H@ && ! defined __BIT_TYPES_DEFINED__ |
| michael@564 | 61 | +#if (@HAVE_SYS_BITYPES_H@ + 0) && ! defined __BIT_TYPES_DEFINED__ |
| michael@564 | 62 | /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines |
| michael@564 | 63 | int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is |
| michael@564 | 64 | included by <sys/types.h>. */ |
| michael@564 | 65 | @@ -535,7 +535,7 @@ |
| michael@564 | 66 | # define SIZE_MAX _STDINT_MAX (0, 32, 0ul) |
| michael@564 | 67 | # endif |
| michael@564 | 68 | #else |
| michael@564 | 69 | -# define SIZE_MAX _STDINT_MAX (0, @BITSIZEOF_SIZE_T@, 0@SIZE_T_SUFFIX@) |
| michael@564 | 70 | +# define SIZE_MAX _STDINT_MAX (0, sizeof(size_t)*8, 0@SIZE_T_SUFFIX@) |
| michael@564 | 71 | #endif |
| michael@564 | 72 | |
| michael@564 | 73 | /* wchar_t limits */ |
| michael@564 | 74 | Index: lib/stringprep.c |
| michael@564 | 75 | --- lib/stringprep.c.orig 2012-04-27 12:48:08.000000000 +0200 |
| michael@564 | 76 | +++ lib/stringprep.c 2012-05-29 09:37:03.000000000 +0200 |
| michael@564 | 77 | @@ -33,6 +33,14 @@ |
| michael@564 | 78 | |
| michael@564 | 79 | #include <stdlib.h> |
| michael@564 | 80 | #include <string.h> |
| michael@564 | 81 | +#include <limits.h> |
| michael@564 | 82 | + |
| michael@564 | 83 | +#undef size_t |
| michael@564 | 84 | +#if 0 |
| michael@564 | 85 | +#ifndef SIZE_MAX |
| michael@564 | 86 | +#define SIZE_MAX ((((size_t)1)<<(sizeof(size_t)*8))-1) |
| michael@564 | 87 | +#endif |
| michael@564 | 88 | +#endif |
| michael@564 | 89 | |
| michael@564 | 90 | #include "stringprep.h" |
| michael@564 | 91 |
