diff options
Diffstat (limited to 'meta-lsb/packages/tar/tar-1.17')
-rw-r--r-- | meta-lsb/packages/tar/tar-1.17/gcc43build.patch | 35 | ||||
-rw-r--r-- | meta-lsb/packages/tar/tar-1.17/m4extensions.patch | 28 |
2 files changed, 63 insertions, 0 deletions
diff --git a/meta-lsb/packages/tar/tar-1.17/gcc43build.patch b/meta-lsb/packages/tar/tar-1.17/gcc43build.patch new file mode 100644 index 0000000000..cc5f0e13d0 --- /dev/null +++ b/meta-lsb/packages/tar/tar-1.17/gcc43build.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | # Fix errors when built with gcc 4.3 | ||
2 | # Patch taken from Debian bug #452096 | ||
3 | |||
4 | diff -urN tar-1.17.orig/lib/argp-fmtstream.h tar-1.17/lib/argp-fmtstream.h | ||
5 | --- tar-1.17.orig/lib/argp-fmtstream.h 2006-01-11 12:24:05.000000000 -0800 | ||
6 | +++ tar-1.17/lib/argp-fmtstream.h 2010-07-22 22:36:12.000000000 -0700 | ||
7 | @@ -198,7 +198,11 @@ | ||
8 | #endif | ||
9 | |||
10 | #ifndef ARGP_FS_EI | ||
11 | -#define ARGP_FS_EI extern inline | ||
12 | + #if defined __GNUC_STDC_INLINE__ | ||
13 | + #define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) | ||
14 | + #else | ||
15 | + #define ARGP_FS_EI extern inline | ||
16 | + #endif | ||
17 | #endif | ||
18 | |||
19 | ARGP_FS_EI size_t | ||
20 | diff -urN tar-1.17.orig/lib/argp.h tar-1.17/lib/argp.h | ||
21 | --- tar-1.17.orig/lib/argp.h 2007-03-30 00:09:11.000000000 -0700 | ||
22 | +++ tar-1.17/lib/argp.h 2010-07-22 22:38:44.000000000 -0700 | ||
23 | @@ -580,7 +580,11 @@ | ||
24 | # endif | ||
25 | |||
26 | # ifndef ARGP_EI | ||
27 | -# define ARGP_EI extern __inline__ | ||
28 | +# if defined __GNUC_STDC_INLINE__ | ||
29 | +# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) | ||
30 | +# else | ||
31 | +# define ARGP_EI extern __inline__ | ||
32 | +# endif | ||
33 | # endif | ||
34 | |||
35 | ARGP_EI void | ||
diff --git a/meta-lsb/packages/tar/tar-1.17/m4extensions.patch b/meta-lsb/packages/tar/tar-1.17/m4extensions.patch new file mode 100644 index 0000000000..11b981aa92 --- /dev/null +++ b/meta-lsb/packages/tar/tar-1.17/m4extensions.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | # Define AC_USE_SYSTEM_EXTENSIONS only if it was previously undefined. | ||
2 | # This is needed to configure correctly with newer versions of autoconf. | ||
3 | |||
4 | --- tar-1.17/m4/extensions.m4.orig 2010-07-22 22:21:35.000000000 -0700 | ||
5 | +++ tar-1.17/m4/extensions.m4 2010-07-22 22:23:41.000000000 -0700 | ||
6 | @@ -1,4 +1,4 @@ | ||
7 | -# serial 4 -*- Autoconf -*- | ||
8 | +# serial 5 -*- Autoconf -*- | ||
9 | # Enable extensions on systems that normally disable them. | ||
10 | |||
11 | # Copyright (C) 2003, 2006 Free Software Foundation, Inc. | ||
12 | @@ -16,6 +16,7 @@ | ||
13 | # ------------------------ | ||
14 | # Enable extensions on systems that normally disable them, | ||
15 | # typically due to standards-conformance issues. | ||
16 | +m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [ | ||
17 | AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
18 | [ | ||
19 | AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
20 | @@ -48,7 +49,7 @@ | ||
21 | AC_DEFINE([__EXTENSIONS__]) | ||
22 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
23 | AC_DEFINE([_TANDEM_SOURCE]) | ||
24 | -]) | ||
25 | +])]) | ||
26 | |||
27 | # gl_USE_SYSTEM_EXTENSIONS | ||
28 | # ------------------------ | ||