diff options
Diffstat (limited to 'meta/recipes-extended/cpio/cpio-2.8')
-rw-r--r-- | meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch | 29 | ||||
-rw-r--r-- | meta/recipes-extended/cpio/cpio-2.8/statdef.patch | 13 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch new file mode 100644 index 0000000000..648c725bba --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.8/m4extensions.patch | |||
@@ -0,0 +1,29 @@ | |||
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 | diff -urN cpio-2.8.orig/m4/extensions.m4 cpio-2.8/m4/extensions.m4 | ||
5 | --- cpio-2.8.orig/m4/extensions.m4 2006-10-12 04:34:45.000000000 -0700 | ||
6 | +++ cpio-2.8/m4/extensions.m4 2010-07-23 14:37:36.000000000 -0700 | ||
7 | @@ -1,4 +1,4 @@ | ||
8 | -# serial 4 -*- Autoconf -*- | ||
9 | +# serial 5 -*- Autoconf -*- | ||
10 | # Enable extensions on systems that normally disable them. | ||
11 | |||
12 | # Copyright (C) 2003, 2006 Free Software Foundation, Inc. | ||
13 | @@ -16,6 +16,7 @@ | ||
14 | # ------------------------ | ||
15 | # Enable extensions on systems that normally disable them, | ||
16 | # typically due to standards-conformance issues. | ||
17 | +m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [], [ | ||
18 | AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], | ||
19 | [ | ||
20 | AC_BEFORE([$0], [AC_COMPILE_IFELSE]) | ||
21 | @@ -48,7 +49,7 @@ | ||
22 | AC_DEFINE([__EXTENSIONS__]) | ||
23 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS]) | ||
24 | AC_DEFINE([_TANDEM_SOURCE]) | ||
25 | -]) | ||
26 | +])]) | ||
27 | |||
28 | # gl_USE_SYSTEM_EXTENSIONS | ||
29 | # ------------------------ | ||
diff --git a/meta/recipes-extended/cpio/cpio-2.8/statdef.patch b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch new file mode 100644 index 0000000000..dfa0d9150a --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.8/statdef.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | # Avoid multiple stat definitions | ||
2 | # Patch taken from cpio mailing list posting 2010-03-19 | ||
3 | |||
4 | diff -urN cpio-2.11.orig/src/filetypes.h cpio-2.11/src/filetypes.h | ||
5 | --- cpio-2.11.orig/src/filetypes.h 2010-02-12 02:19:23.000000000 -0800 | ||
6 | +++ cpio-2.11/src/filetypes.h 2010-07-23 13:17:25.000000000 -0700 | ||
7 | @@ -82,4 +82,6 @@ | ||
8 | #define lstat stat | ||
9 | #endif | ||
10 | int lstat (); | ||
11 | +#ifndef stat | ||
12 | int stat (); | ||
13 | +#endif | ||