[PATCH 0/1] puzzles: fix do_compile failed when DEBUG_BUILD

[PATCH 0/1] puzzles: fix do_compile failed when DEBUG_BUILD

[Hongxu Jia]

Test steps:

1. vim local.conf
...
MACHINE = "qemux86-64"
DEBUG_BUILD = "1"
...

2. bitbake puzzles

//Hongxu

The following changes since commit 870bb8d35547b8313b3a487d7e8b914ab9470e64:

  local.conf.sample.extended: fix example for EXTRA_USERS_PARAMS (2014-08-04 17:38:24 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/fix-puzzles
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-puzzles

Hongxu Jia (1):
  puzzles: fix do_compile failed when DEBUG_BUILD

 .../fix-compiling-failure-with-option-g-O.patch    | 52 ++++++++++++++++++++++
 meta/recipes-sato/puzzles/puzzles_r10116.bb        |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch

-- 
1.9.1

[PATCH 1/1] puzzles: fix do_compile failed when DEBUG_BUILD

[Hongxu Jia]

There were compiling failure with option -g -O
...
././gtk.c: In function 'configure_area':
././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  cairo_set_source_rgb(cr,
  ^
././gtk.c:384:14: note: 'cr' was declared here
     cairo_t *cr;
              ^
././gtk.c: In function 'main':
././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized]
      fprintf(stderr, "%s: %s\n", pname, error);
      ^
cc1: all warnings being treated as errors
...

Initialized the pointers 'cr' and 'error' with NULL

[YOCTO #6410]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../fix-compiling-failure-with-option-g-O.patch    | 52 ++++++++++++++++++++++
 meta/recipes-sato/puzzles/puzzles_r10116.bb        |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch

diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
new file mode 100644
index 0000000..d246fee
--- /dev/null
+++ b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
@@ -0,0 +1,52 @@
+gtk.c: fix compiling failure with option -g -O
+
+There were compiling failure with option -g -O
+...
+././gtk.c: In function 'configure_area':
+././gtk.c:397:2: error: 'cr' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+  cairo_set_source_rgb(cr,
+  ^
+././gtk.c:384:14: note: 'cr' was declared here
+     cairo_t *cr;
+              ^
+././gtk.c: In function 'main':
+././gtk.c:2911:6: error: 'error' may be used uninitialized in this function [-Werror=maybe-uninitialized]
+      fprintf(stderr, "%s: %s\n", pname, error);
+      ^
+cc1: all warnings being treated as errors
+...
+
+Initialized pointer 'cr' and 'error' with NULL
+
+Upstream-Status: Pending
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ gtk.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gtk.c b/gtk.c
+index a2eba2c..c54bf63 100644
+--- a/gtk.c
++++ b/gtk.c
+@@ -381,7 +381,7 @@ static void clear_backing_store(frontend *fe)
+ 
+ static void setup_backing_store(frontend *fe)
+ {
+-    cairo_t *cr;
++    cairo_t *cr = NULL;
+     int i;
+ 
+     fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
+@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp)
+ int main(int argc, char **argv)
+ {
+     char *pname = argv[0];
+-    char *error;
++    char *error = NULL;
+     int ngenerate = 0, print = FALSE, px = 1, py = 1;
+     int time_generation = FALSE, test_solve = FALSE, list_presets = FALSE;
+     int soln = FALSE, colour = FALSE;
+-- 
+1.9.1
+
diff --git a/meta/recipes-sato/puzzles/puzzles_r10116.bb b/meta/recipes-sato/puzzles/puzzles_r10116.bb
index ef5392b..6ee4d96 100644
--- a/meta/recipes-sato/puzzles/puzzles_r10116.bb
+++ b/meta/recipes-sato/puzzles/puzzles_r10116.bb
@@ -7,7 +7,9 @@ MOD_PV = "${@d.getVar('PV',1)[1:]}"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=33bcd4bce8f3c197f2aefbdbd2d299bc"
 
-SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV}"
+SRC_URI = "svn://svn.tartarus.org/sgt;module=puzzles;rev=${MOD_PV} \
+           file://fix-compiling-failure-with-option-g-O.patch \
+"
 
 S = "${WORKDIR}/${BPN}"
 
-- 
1.9.1

Re: [PATCH 0/1] puzzles: fix do_compile failed when DEBUG_BUILD

[Hongxu Jia]

Ping

//Hongxu

On 08/11/2014 12:39 PM, Hongxu Jia wrote:
> Test steps:
>
> 1. vim local.conf
> ...
> MACHINE = "qemux86-64"
> DEBUG_BUILD = "1"
> ...
>
> 2. bitbake puzzles
>
> //Hongxu
>
> The following changes since commit 870bb8d35547b8313b3a487d7e8b914ab9470e64:
>
>    local.conf.sample.extended: fix example for EXTRA_USERS_PARAMS (2014-08-04 17:38:24 +0100)
>
> are available in the git repository at:
>
>    git://git.pokylinux.org/poky-contrib hongxu/fix-puzzles
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-puzzles
>
> Hongxu Jia (1):
>    puzzles: fix do_compile failed when DEBUG_BUILD
>
>   .../fix-compiling-failure-with-option-g-O.patch    | 52 ++++++++++++++++++++++
>   meta/recipes-sato/puzzles/puzzles_r10116.bb        |  4 +-
>   2 files changed, 55 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
>