]> code.ossystems Code Review - openembedded-core.git/commitdiff
puzzles: Fix build in x32 ABI
authorAníbal Limón <anibal.limon@linux.intel.com>
Sun, 15 Mar 2015 12:02:29 +0000 (12:02 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 20 Mar 2015 23:51:26 +0000 (23:51 +0000)
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>
meta/recipes-sato/puzzles/files/puzzles_x32_abi_time.patch [new file with mode: 0644]
meta/recipes-sato/puzzles/puzzles_r10116.bb

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 (file)
index 0000000..63ab0b8
--- /dev/null
@@ -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) {
index 6ee4d962b2b500491ecddedbb7692f47d731c2e2..3bc2c85bb12aa730e8f9f4fe12a4451c541a0a69 100644 (file)
@@ -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}"