openpkg/tar.patch@9dacbd1d1aa2 (annotated)
openpkg/tar.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
- parent 250
- bda4f5eec616
- 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@13 | 1 | Index: Makefile.in |
| michael@428 | 2 | --- Makefile.in.orig 2011-03-12 10:50:13.000000000 +0100 |
| michael@428 | 3 | +++ Makefile.in 2011-07-31 17:41:03.000000000 +0200 |
| michael@428 | 4 | @@ -1028,7 +1028,7 @@ |
| michael@250 | 5 | top_srcdir = @top_srcdir@ |
| michael@13 | 6 | ACLOCAL_AMFLAGS = -I m4 |
| michael@250 | 7 | EXTRA_DIST = ChangeLog.1 Make.rules |
| michael@250 | 8 | -SUBDIRS = doc gnu lib rmt src scripts po tests |
| michael@250 | 9 | +SUBDIRS = doc gnu lib src |
| michael@250 | 10 | gen_start_date = 2009-03-06 |
| michael@250 | 11 | prev_change_log = ChangeLog.CVS |
| michael@250 | 12 | changelog_dir = . |
| michael@250 | 13 | Index: gnu/argp-help.c |
| michael@428 | 14 | --- gnu/argp-help.c.orig 2011-03-12 10:14:26.000000000 +0100 |
| michael@428 | 15 | +++ gnu/argp-help.c 2011-07-31 17:44:24.000000000 +0200 |
| michael@428 | 16 | @@ -571,10 +571,7 @@ |
| michael@13 | 17 | return val; |
| michael@13 | 18 | } |
| michael@13 | 19 | |
| michael@13 | 20 | -static inline int |
| michael@428 | 21 | -#if __GNUC__ >= 3 |
| michael@13 | 22 | -__attribute__ ((always_inline)) |
| michael@428 | 23 | -#endif |
| michael@13 | 24 | +static int |
| michael@13 | 25 | hol_entry_long_iterate (const struct hol_entry *entry, |
| michael@250 | 26 | int (*func)(const struct argp_option *opt, |
| michael@250 | 27 | const struct argp_option *real, |
| michael@250 | 28 | Index: gnu/strerror.c |
| michael@428 | 29 | --- gnu/strerror.c.orig 2011-03-12 10:14:33.000000000 +0100 |
| michael@428 | 30 | +++ gnu/strerror.c 2011-07-31 17:41:03.000000000 +0200 |
| michael@250 | 31 | @@ -25,6 +25,7 @@ |
| michael@250 | 32 | |
| michael@250 | 33 | # include <errno.h> |
| michael@250 | 34 | # include <stdio.h> |
| michael@250 | 35 | +# include <limits.h> |
| michael@250 | 36 | |
| michael@250 | 37 | # if GNULIB_defined_ESOCK /* native Windows platforms */ |
| michael@250 | 38 | # if HAVE_WINSOCK2_H |
| michael@13 | 39 | Index: src/tar.c |
| michael@428 | 40 | --- src/tar.c.orig 2010-10-24 20:07:55.000000000 +0200 |
| michael@428 | 41 | +++ src/tar.c 2011-07-31 17:41:03.000000000 +0200 |
| michael@13 | 42 | @@ -20,6 +20,7 @@ |
| michael@13 | 43 | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ |
| michael@13 | 44 | |
| michael@13 | 45 | #include <system.h> |
| michael@13 | 46 | +#include <locale.h> |
| michael@13 | 47 | |
| michael@13 | 48 | #include <fnmatch.h> |
| michael@13 | 49 | #include <argp.h> |
| michael@13 | 50 | Index: src/utf8.c |
| michael@428 | 51 | --- src/utf8.c.orig 2010-01-22 18:18:15.000000000 +0100 |
| michael@428 | 52 | +++ src/utf8.c 2011-07-31 17:41:03.000000000 +0200 |
| michael@13 | 53 | @@ -22,6 +22,9 @@ |
| michael@13 | 54 | #include "common.h" |
| michael@13 | 55 | #ifdef HAVE_ICONV_H |
| michael@13 | 56 | # include <iconv.h> |
| michael@13 | 57 | +#else |
| michael@13 | 58 | +# define iconv_t void * |
| michael@13 | 59 | +# define ICONV_CONST const |
| michael@13 | 60 | #endif |
| michael@13 | 61 | |
| michael@13 | 62 | #ifndef ICONV_CONST |
| michael@13 | 63 | Index: src/xheader.c |
| michael@428 | 64 | --- src/xheader.c.orig 2010-11-27 12:18:49.000000000 +0100 |
| michael@428 | 65 | +++ src/xheader.c 2011-07-31 17:41:03.000000000 +0200 |
| michael@250 | 66 | @@ -26,6 +26,10 @@ |
| michael@13 | 67 | |
| michael@250 | 68 | #include "common.h" |
| michael@13 | 69 | |
| michael@13 | 70 | +#ifndef SIZE_MAX |
| michael@13 | 71 | +# define SIZE_MAX ((size_t) -1) |
| michael@13 | 72 | +#endif |
| michael@13 | 73 | + |
| michael@428 | 74 | static void xheader_init (struct xheader *xhdr); |
| michael@13 | 75 | static bool xheader_protected_pattern_p (char const *pattern); |
| michael@13 | 76 | static bool xheader_protected_keyword_p (char const *keyword); |
