more fixes related to gcc 4.6.0
cover more fixes related to gcc 4.6.0
From: Nitin A Kamble <[email protected]>
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: nitin/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Thanks,
Nitin A Kamble <[email protected]>
---
Nitin A Kamble (5):
libunique: Fix for compilation with gcc 4.6.0
matchbox-wm-2: fix typo in Makefile
web: fix typo in Makefile
zaurusd: fix a typo in Makefile
dtc: fix compilation with gcc 4.6.0
.../recipes-bsp/zaurusd/zaurusd/fix_makefile.patch | 19 +++++++ meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 5 +- .../libunique/fix_for_compile_with_gcc-4.6.0.patch | 36 ++++++++++++++ meta/recipes-gnome/libunique/libunique_1.1.6.bb | 5 +- .../matchbox-wm-2/matchbox-wm-2/fix_makefile.patch | 19 +++++++ .../matchbox-wm-2/matchbox-wm-2_svn.bb | 3 +- .../dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 ++++++++++++++++++++ meta/recipes-kernel/dtc/dtc_git.inc | 5 +- meta/recipes-sato/web/web/fix_makefile.patch | 20 ++++++++ meta/recipes-sato/web/web_git.bb | 3 +- 10 files changed, 158 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch create mode 100644 meta/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch create mode 100644 meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch create mode 100644 meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch create mode 100644 meta/recipes-sato/web/web/fix_makefile.patch
Signature · 1 line
1.7.3.4
PATCH 1/5 libunique: Fix for compilation with gcc 4.6.0
From: Nitin A Kamble <[email protected]>
--- .../libunique/fix_for_compile_with_gcc-4.6.0.patch | 36 ++++++++++++++++++++ meta/recipes-gnome/libunique/libunique_1.1.6.bb | 5 ++- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch
meta/recipes-gnome/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch new file +36 -0
@@ -0,0 +1,36 @@ +Upstream-Status: Pending + +Fix Following compilation errors with gcc 4.6.0 + +Nitin A Kamble <[email protected]> 2011/05/10 + +| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': +| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] +| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': +| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 + +Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +=================================================================== +--- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c ++++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq + static gboolean + unique_backend_dbus_request_name (UniqueBackend *backend) + { +- UniqueBackendDBus *backend_dbus; ++ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; + const gchar *name; + DBusGConnection *connection; + DBusGProxy *proxy; +@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique + GValueArray *data; + gchar *cmd; + gchar *resp; +- gboolean res; ++ gboolean __attribute__((__unused__)) res; + GError *error; + UniqueResponse response; +
meta/recipes-gnome/libunique/libunique_1.1.6.bb +3 -2
@@ -2,12 +2,13 @@ DESCRIPTION = "Unique is a library for writing single instance application. If y HOMEPAGE = "http://live.gnome.org/LibUnique" BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" -SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2" +SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ + file://fix_for_compile_with_gcc-4.6.0.patch" SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" -PR = "r2" +PR = "r3" DEPENDS = "glib-2.0 gtk+ dbus"
Signature · 1 line
1.7.3.4
PATCH 2/5 matchbox-wm-2: fix typo in Makefile
In reply to Nitin A KambleFrom: Nitin A Kamble <[email protected]>
--- .../matchbox-wm-2/matchbox-wm-2/fix_makefile.patch | 19 +++++++++++++++++++ .../matchbox-wm-2/matchbox-wm-2_svn.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch
meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2/fix_makefile.patch new file +19 -0
@@ -0,0 +1,19 @@ +Upstream-Status: Pending + +Nitin A Kamble <[email protected]> 2011/05/10 +Fix following build error: +| Makefile:734: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. +| ERROR: oe_runmake failed + +Index: matchbox-window-manager-2/Makefile.am +=================================================================== +--- matchbox-window-manager-2.orig/Makefile.am ++++ matchbox-window-manager-2/Makefile.am +@@ -3,6 +3,6 @@ SUBDIRS = matchbox data doc util + # Extra clean files so that maintainer-clean removes *everything* + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snapshot-`date +"%Y%m%d"` + + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
meta/recipes-graphics/matchbox-wm-2/matchbox-wm-2_svn.bb +2 -1
@@ -7,9 +7,10 @@ DEPENDS = "virtual/libx11 libxext libxrender startup-notification expat gconf pa SRCREV = "2106" PV = "0.0+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \ + file://fix_makefile.patch \ " S = "${WORKDIR}/matchbox-window-manager-2"
Signature · 1 line
1.7.3.4
PATCH 3/5 web: fix typo in Makefile
In reply to Nitin A KambleFrom: Nitin A Kamble <[email protected]>
--- meta/recipes-sato/web/web/fix_makefile.patch | 20 ++++++++++++++++++++ meta/recipes-sato/web/web_git.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-sato/web/web/fix_makefile.patch
meta/recipes-sato/web/web/fix_makefile.patch new file +20 -0
@@ -0,0 +1,20 @@ +Upstream-Status: Pending + +Nitin A Kamble <[email protected]> 2011/05/10 +Fix following build error: + +| NOTE: make -j 16 +| Makefile:719: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. +| ERROR: oe_runmake failed + +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -5,5 +5,5 @@ SUBDIRS = src data + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-sato/web/web_git.bb +2 -1
@@ -2,13 +2,14 @@ LICENSE = "GPLv2" SECTION = "x11" DEPENDS = "libxml2 glib-2.0 gtk+ libglade gtkhtml2 curl gconf js libowl" DESCRIPTION = "Web is a multi-platform web browsing application." -PR = "r0" +PR = "r1" SRCREV = "96da839f65e17ecc6d5261c1d74accd88423dd7a" PV = "0.0+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/web-sato;protocol=git \ file://owl-window-menu.patch \ + file://fix_makefile.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
Signature · 1 line
1.7.3.4
PATCH 4/5 zaurusd: fix a typo in Makefile
In reply to Nitin A KambleFrom: Nitin A Kamble <[email protected]>
--- .../recipes-bsp/zaurusd/zaurusd/fix_makefile.patch | 19 +++++++++++++++++++ meta/recipes-bsp/zaurusd/zaurusd_svn.bb | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch
meta/recipes-bsp/zaurusd/zaurusd/fix_makefile.patch new file +19 -0
@@ -0,0 +1,19 @@ +Upstream-Status: Pending + +Nitin A Kamble <[email protected]> 2011/05/10 +Fix following build error: + +| Makefile:716: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. +| ERROR: oe_runmake failed + +Index: zaurusd/Makefile.am +=================================================================== +--- zaurusd.orig/Makefile.am ++++ zaurusd/Makefile.am +@@ -4,5 +4,5 @@ SUBDIRS = apps config scripts + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-bsp/zaurusd/zaurusd_svn.bb +3 -2
@@ -6,9 +6,10 @@ DEPENDS = "tslib" RDEPENDS_${PN} = "xrandr" SRCREV = "426" PV = "0.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http" +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ + file://fix_makefile.patch" S = "${WORKDIR}/${PN}"
Signature · 1 line
1.7.3.4
PATCH 5/5 dtc: fix compilation with gcc 4.6.0
In reply to Nitin A KambleFrom: Nitin A Kamble <[email protected]>
--- .../dtc/fix_for_compilation_with_gcc_4.6.0.patch | 51 ++++++++++++++++++++ meta/recipes-kernel/dtc/dtc_git.inc | 5 +- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch
meta/recipes-kernel/dtc/dtc/fix_for_compilation_with_gcc_4.6.0.patch new file +51 -0
@@ -0,0 +1,51 @@ +Upstream-Status: Pending + +Fix following compilation errors with gcc 4.6.0 +| dtc.c: In function 'main': +| dtc.c:100:17: error: variable 'check' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [dtc.o] Error 1 +| make: *** Waiting for unfinished jobs.... +| flattree.c: In function 'flat_read_mem_reserve': +| flattree.c:700:14: error: variable 'p' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make: *** [flattree.o] Error 1 +| ERROR: oe_runmake failed + +Nitin A Kamble <[email protected]> 2011/05/10 + +Index: git/dtc.c +=================================================================== +--- git.orig/dtc.c ++++ git/dtc.c +@@ -97,7 +97,7 @@ int main(int argc, char *argv[]) + const char *inform = "dts"; + const char *outform = "dts"; + const char *outname = "-"; +- int force = 0, check = 0; ++ int force = 0, __attribute__((__unused__)) check = 0; + const char *arg; + int opt; + FILE *outf = NULL; +Index: git/flattree.c +=================================================================== +--- git.orig/flattree.c ++++ git/flattree.c +@@ -697,7 +697,6 @@ static struct reserve_info *flat_read_me + { + struct reserve_info *reservelist = NULL; + struct reserve_info *new; +- const char *p; + struct fdt_reserve_entry re; + + /* +@@ -706,7 +705,6 @@ static struct reserve_info *flat_read_me + * + * First pass, count entries. + */ +- p = inb->ptr; + while (1) { + flat_read_chunk(inb, &re, sizeof(re)); + re.address = fdt64_to_cpu(re.address);
meta/recipes-kernel/dtc/dtc_git.inc +3 -2
@@ -1,7 +1,8 @@ -SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git" +SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \ + file://fix_for_compilation_with_gcc_4.6.0.patch" SRCREV = "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" PV = "1.2.0+git${SRCPV}" -PR = "r2" +PR = "r3" S = "${WORKDIR}/git"
Signature · 1 line
1.7.3.4
Richard Purdie
AppliedQuoted 12 lines · Nitin A Kamble
From: Nitin A Kamble <[email protected]>
Pull URL:
git://git.pokylinux.org/poky-contrib.git
Branch: nitin/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/miscThanks,
Nitin A Kamble <[email protected]>
---
Quoted 6 lines
Nitin A Kamble (5):
libunique: Fix for compilation with gcc 4.6.0
matchbox-wm-2: fix typo inMakefile
web: fix typo inMakefile
zaurusd: fix a typo inMakefile
dtc: fix compilation with gcc 4.6.0
Merged to master, thanks.
Richard