omgps: fix do_compile error due to uninitialized variable
PATCH 1/2 omgps: fix do_compile error due to uninitialized variable
The problem happended since there was an uninitialized variable with gcc 4.9 and the parameter -Werror=maybe-uninitialized. Initialized the variable and checked for side effects. Removed from blacklist.
Signed-off-by Raphael Silva <[email protected]>
--- .../omgps/omgps/fix.build.with.gcc.4.9.patch | 22 ++++++++++++++++++++++ meta-oe/recipes-navigation/omgps/omgps_svn.bb | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch
meta-oe/recipes-navigation/omgps/omgps/fix.build.with.gcc.4.9.patch new file +22 -0
@@ -0,0 +1,22 @@ +omgps: omgps fails compilation due to uninitialized variables + +omgps does not compile with gcc 4.9 due to uninitialized variables +with the option -Werror=maybe-uninitialized +To solve the problem, just initiated the variable and checked for side +effects. +Upstream-Status: Submitted ++https://code.google.com/p/omgps/issues/detail?id=16 + +Signed-off-by: Raphael Silva <[email protected]> +diff -urpN omgps.orig/src/sound.c omgps/src/sound.c +--- omgps.orig/src/sound.c 2014-12-14 15:13:29.609243994 -0200 ++++ omgps/src/sound.c 2014-12-14 15:14:13.831116745 -0200 +@@ -44,7 +44,7 @@ static gboolean play_sound_files(char *f + return FALSE; + + char *bak = strdup(files); +- char *saveptr; ++ char *saveptr = NULL; + char *p = strtok_r(bak, ";", &saveptr); + + #define MAX_SOUND_FILES 14
meta-oe/recipes-navigation/omgps/omgps_svn.bb +1 -1
@@ -9,7 +9,6 @@ PV = "0.1+svnr${SRCPV}" PR = "r2" S = "${WORKDIR}/${PN}" -PNBLACKLIST[omgps] = "BROKEN: sound.c:61:35: error: 'saveptr' may be used uninitialized in this function [-Werror=maybe-uninitialized]" do_configure_prepend() { sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am
@@ -24,6 +23,7 @@ SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \ file://fix.build.with.glib.2.34.patch \ file://gdk-pixbuf-2.26.5.patch \ file://0001-g_type_init-is-deprecated-for-glib-2.35.0.patch \ + file://fix.build.with.gcc.4.9.patch \ " inherit autotools pkgconfig
Signature · 1 line
2.2.0
PATCH 2/2 omgps: fixing B!=S build issue
Fixed relative path affected by B != S, otherwise
It has a do_compile error:
No rule to make target `data/etc/*.*'
Signed-off-by Raphael Silva <[email protected]>
--- meta-oe/recipes-navigation/omgps/omgps_svn.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/recipes-navigation/omgps/omgps_svn.bb +1 -0
@@ -13,6 +13,7 @@ S = "${WORKDIR}/${PN}" do_configure_prepend() { sed -i "s#PY_VERSION = 2.6#PY_VERSION = ${PYTHON_BASEVERSION}#g" ${S}/Makefile.am sed -i "s#PY_INC_DIR = \$(OPIEDIR)#PY_INC_DIR = ${STAGING_DIR_HOST}#g" ${S}/Makefile.am + sed -i "s#dist_conf_DATA = data/etc/\*\.\*#dist_conf_DATA = ${S}/data/etc/\*\.\*#g" ${S}/Makefile.am } SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;protocol=http \
Signature · 1 line
2.2.0