diff options
| author | Scott Garman <sgarman@zenlinux.com> | 2010-08-16 14:45:29 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 13:04:38 +0100 |
| commit | e08ae7ea65950721b2d682f90c44e739683e1cdc (patch) | |
| tree | 20e5263b11edc6cdf4e60f7acca90d1d233c0f0e /meta | |
| parent | 9a60cbcf48deac3d36643f03943b8b1b1c4dfd0e (diff) | |
| download | poky-e08ae7ea65950721b2d682f90c44e739683e1cdc.tar.gz | |
tar_1.17: eliminate a patch by setting CFLAGS instead
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/tar/tar-1.17/gcc43build.patch | 35 | ||||
| -rw-r--r-- | meta/packages/tar/tar_1.17.bb | 7 |
2 files changed, 4 insertions, 38 deletions
diff --git a/meta/packages/tar/tar-1.17/gcc43build.patch b/meta/packages/tar/tar-1.17/gcc43build.patch deleted file mode 100644 index cc5f0e13d0..0000000000 --- a/meta/packages/tar/tar-1.17/gcc43build.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 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/packages/tar/tar_1.17.bb b/meta/packages/tar/tar_1.17.bb index be74542091..729aecc984 100644 --- a/meta/packages/tar/tar_1.17.bb +++ b/meta/packages/tar/tar_1.17.bb | |||
| @@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | |||
| 5 | 5 | ||
| 6 | PR = "r0" | 6 | PR = "r0" |
| 7 | 7 | ||
| 8 | SRC_URI += "file://m4extensions.patch \ | 8 | SRC_URI += "file://m4extensions.patch" |
| 9 | file://gcc43build.patch \ | ||
| 10 | " | ||
| 11 | 9 | ||
| 12 | SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290" | 10 | SRC_URI[md5sum] = "c6c4f1c075dbf0f75c29737faa58f290" |
| 13 | SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492" | 11 | SRC_URI[sha256sum] = "19f9021dda51a16295e4706e80870e71f87107675e51c176a491eba0fc4ca492" |
| 12 | |||
| 13 | # Required to build with gcc 4.3 and later: | ||
| 14 | CFLAGS += "-fgnu89-inline" | ||