From d342810cd545accffe26c218e4fa80431802185f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Sun, 15 Mar 2015 12:02:29 +0000 Subject: puzzles: Fix build in x32 ABI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- .../puzzles/files/puzzles_x32_abi_time.patch | 30 ++++++++++++++++++++++ meta/recipes-sato/puzzles/puzzles_r10116.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch (limited to 'meta/recipes-sato') 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 0000000..63ab0b8 --- /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 + +--- 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 6ee4d96..3bc2c85 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}" -- cgit v1.1