diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-03-15 12:02:29 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 23:56:04 +0000 |
| commit | d342810cd545accffe26c218e4fa80431802185f (patch) | |
| tree | 83260bdc986ce88db1996896b84292794886b1a8 | |
| parent | 4add6e3a3bf2796c74e5e818dad9b31f4dbccba4 (diff) | |
| download | poky-d342810cd545accffe26c218e4fa80431802185f.tar.gz | |
puzzles: Fix build in x32 ABI
Add patch for make castings to time_t values that are long long int
in x32 ABI.
[YOCTO #7447]
(From OE-Core rev: fc5717a7a5828eaf07d96b7c5c6eae7a79bb5114)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-sato/puzzles/puzzles_r10116.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch new file mode 100644 index 0000000000..63ab0b888d --- /dev/null +++ b/meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | Fix printf's for time_t value add castings because ISOC90 | ||
| 2 | don't support long long int that is used in x32 ABI for | ||
| 3 | time_t. | ||
| 4 | |||
| 5 | Upstream-Status: Backport | ||
| 6 | |||
| 7 | Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> | ||
| 8 | |||
| 9 | --- a/magnets.c 2015-03-15 11:57:39.106674811 +0000 | ||
| 10 | +++ b/magnets.c 2015-03-15 11:57:58.638674795 +0000 | ||
| 11 | @@ -2562,7 +2562,7 @@ | ||
| 12 | goto done; | ||
| 13 | } | ||
| 14 | s = new_game(NULL, p, desc); | ||
| 15 | - printf("%s:%s (seed %ld)\n", id, desc, seed); | ||
| 16 | + printf("%s:%s (seed %ld)\n", id, desc, (long) seed); | ||
| 17 | if (aux) { | ||
| 18 | /* We just generated this ourself. */ | ||
| 19 | if (verbose || print) { | ||
| 20 | --- a/signpost.c 2015-03-15 11:58:52.866674751 +0000 | ||
| 21 | +++ b/signpost.c 2015-03-15 11:59:08.190674738 +0000 | ||
| 22 | @@ -2393,7 +2393,7 @@ | ||
| 23 | } | ||
| 24 | } | ||
| 25 | |||
| 26 | - sprintf(newseed, "%lu", time(NULL)); | ||
| 27 | + sprintf(newseed, "%lu", (unsigned long) time(NULL)); | ||
| 28 | seedstr = dupstr(newseed); | ||
| 29 | |||
| 30 | if (id || !stdin_desc) { | ||
diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb index 6ee4d962b2..3bc2c85bb1 100644 --- a/meta/recipes-sato/puzzles/puzzles_r10116.bb +++ b/meta/recipes-sato/puzzles/puzzles_r10116.bb | |||
| @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc" | |||
| 9 | 9 | ||
| 10 | SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ | 10 | SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ |
| 11 | file://fix-compiling-failure-with-option-g-O.patch \ | 11 | file://fix-compiling-failure-with-option-g-O.patch \ |
| 12 | file://puzzles_x32_abi_time.patch \ | ||
| 12 | " | 13 | " |
| 13 | 14 | ||
| 14 | S = "${WORKDIR}/${BPN}" | 15 | S = "${WORKDIR}/${BPN}" |
