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:51:26 +0000 |
| commit | fc5717a7a5828eaf07d96b7c5c6eae7a79bb5114 (patch) | |
| tree | 4b2ed0f30bd785a75a8b07ae3c434d740f01139c /meta/recipes-sato | |
| parent | 194f0be44fa37605d0b5897138848fa378593d62 (diff) | |
| download | openembedded-core-fc5717a7a5828eaf07d96b7c5c6eae7a79bb5114.tar.gz openembedded-core-fc5717a7a5828eaf07d96b7c5c6eae7a79bb5114.tar.bz2 openembedded-core-fc5717a7a5828eaf07d96b7c5c6eae7a79bb5114.zip | |
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]
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Diffstat (limited to 'meta/recipes-sato')
| -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 @@ +Fix printf's for time_t value add castings because ISOC90 +don't support long long int that is used in x32 ABI for +time_t. + +Upstream-Status: Backport + +Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> + +--- a/magnets.c 2015-03-15 11:57:39.106674811 +0000 ++++ b/magnets.c 2015-03-15 11:57:58.638674795 +0000 +@@ -2562,7 +2562,7 @@ + goto done; + } + s = new_game(NULL, p, desc); +- printf("%s:%s (seed %ld)\n", id, desc, seed); ++ printf("%s:%s (seed %ld)\n", id, desc, (long) seed); + if (aux) { + /* We just generated this ourself. */ + if (verbose || print) { +--- a/signpost.c 2015-03-15 11:58:52.866674751 +0000 ++++ b/signpost.c 2015-03-15 11:59:08.190674738 +0000 +@@ -2393,7 +2393,7 @@ + } + } + +- sprintf(newseed, "%lu", time(NULL)); ++ sprintf(newseed, "%lu", (unsigned long) time(NULL)); + seedstr = dupstr(newseed); + + 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" SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \ file://fix-compiling-failure-with-option-g-O.patch \ + file://puzzles_x32_abi_time.patch \ " S = "${WORKDIR}/${BPN}" |