openpkg/tar.patch

Sun, 03 Apr 2011 13:34:55 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sun, 03 Apr 2011 13:34:55 +0200
changeset 337
f71e028eb3e2
parent 13
cb59d6afeb61
child 428
f880f219c566
permissions
-rw-r--r--

Correct and improve several packaging aspects including...
Correct datadir path for python modules, correct jar(1) path for
building libgcj classes, strip libexecdir path of version numbers,
improve name of oblbld build path, clean whitespace from as(1) and
ld(1) GNU detection, remove seemingly discarded '--with-local-prefix'
configure argument, and correct hardcoded lto plugin libtool archive
dependency information.

Most importantly, correct IA32 architecture detection logic in
config.gcc to correctly emit SSE2 instructions conditionally, leading
to the removal of all '-march' bootstrap options and replacement with
unconditional (for IA32/AMD64) '-mtune=native' options. Comments and
buildtime warnings are corrected appropriately. In theory these changes
cause a more portable, orthoganal, and optimal bootstrap to be built.

     1 Index: Makefile.in
     2 --- Makefile.in.orig	2010-03-10 11:52:09.000000000 +0100
     3 +++ Makefile.in	2010-03-10 18:28:13.000000000 +0100
     4 @@ -899,7 +899,7 @@
     5  top_srcdir = @top_srcdir@
     6  ACLOCAL_AMFLAGS = -I m4
     7  EXTRA_DIST = ChangeLog.1 Make.rules
     8 -SUBDIRS = doc gnu lib rmt src scripts po tests
     9 +SUBDIRS = doc gnu lib src
    10  gen_start_date = 2009-03-06
    11  prev_change_log = ChangeLog.CVS
    12  changelog_dir = .
    13 Index: gnu/argp-help.c
    14 --- gnu/argp-help.c.orig	2010-03-10 11:50:33.000000000 +0100
    15 +++ gnu/argp-help.c	2010-03-10 18:26:15.000000000 +0100
    16 @@ -571,8 +571,7 @@
    17    return val;
    18  }
    20 -static inline int
    21 -__attribute__ ((always_inline))
    22 +static int
    23  hol_entry_long_iterate (const struct hol_entry *entry,
    24                          int (*func)(const struct argp_option *opt,
    25                                      const struct argp_option *real,
    26 Index: gnu/strerror.c
    27 --- gnu/strerror.c.orig	2010-03-10 11:50:43.000000000 +0100
    28 +++ gnu/strerror.c	2010-03-10 18:26:15.000000000 +0100
    29 @@ -25,6 +25,7 @@
    31  # include <errno.h>
    32  # include <stdio.h>
    33 +# include <limits.h>
    35  # if GNULIB_defined_ESOCK /* native Windows platforms */
    36  #  if HAVE_WINSOCK2_H
    37 Index: src/compare.c
    38 --- src/compare.c.orig	2010-01-26 12:28:09.000000000 +0100
    39 +++ src/compare.c	2010-03-10 18:26:15.000000000 +0100
    40 @@ -277,7 +277,7 @@
    41    size_t len = strlen (current_stat_info.link_name);
    42    char *linkbuf = alloca (len + 1);
    44 -  int status = readlink (current_stat_info.file_name, linkbuf, len + 1);
    45 +  int status = readlink (current_stat_info.file_name, linkbuf, len);
    47    if (status < 0)
    48      {
    49 Index: src/create.c
    50 --- src/create.c.orig	2010-03-09 13:52:41.000000000 +0100
    51 +++ src/create.c	2010-03-10 18:26:15.000000000 +0100
    52 @@ -1690,7 +1690,7 @@
    53        if (linklen != st->stat.st_size || linklen + 1 == 0)
    54  	xalloc_die ();
    55        buffer = (char *) alloca (linklen + 1);
    56 -      size = readlink (p, buffer, linklen + 1);
    57 +      size = readlink (p, buffer, linklen);
    58        if (size < 0)
    59  	{
    60  	  file_removed_diag (p, top_level, readlink_diag);
    61 Index: src/tar.c
    62 --- src/tar.c.orig	2010-03-09 13:52:41.000000000 +0100
    63 +++ src/tar.c	2010-03-10 18:26:15.000000000 +0100
    64 @@ -20,6 +20,7 @@
    65     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
    67  #include <system.h>
    68 +#include <locale.h>
    70  #include <fnmatch.h>
    71  #include <argp.h>
    72 Index: src/utf8.c
    73 --- src/utf8.c.orig	2010-01-26 12:30:20.000000000 +0100
    74 +++ src/utf8.c	2010-03-10 18:26:15.000000000 +0100
    75 @@ -22,6 +22,9 @@
    76  #include "common.h"
    77  #ifdef HAVE_ICONV_H
    78  # include <iconv.h>
    79 +#else
    80 +# define iconv_t void *
    81 +# define ICONV_CONST const
    82  #endif
    84  #ifndef ICONV_CONST
    85 Index: src/xheader.c
    86 --- src/xheader.c.orig	2010-02-12 11:03:09.000000000 +0100
    87 +++ src/xheader.c	2010-03-10 18:26:15.000000000 +0100
    88 @@ -26,6 +26,10 @@
    90  #include "common.h"
    92 +#ifndef SIZE_MAX
    93 +# define SIZE_MAX ((size_t) -1)
    94 +#endif
    95 +
    96  static bool xheader_protected_pattern_p (char const *pattern);
    97  static bool xheader_protected_keyword_p (char const *keyword);
    98  static void xheader_set_single_keyword (char *) __attribute__ ((noreturn));

mercurial