[patch] compile opkg-sdk-native with gcc 4.3

[Khem Raj <raj.khem@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

Hi,

I needed this patch to hush some format warnings and unused return values from functions that were being generated by gcc 4.3 (intrepid alpha5 host). adding -Wno-error probably could have worked but I thought its better to fix the code.

OK for .dev?

Thx

-Khem


[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 5843 bytes --]

#
# old_revision [55e46cdb21e91c646ec2e35878786ac533e6967a]
#
# add_file "packages/opkg/files/opkg-gcc-4.3-compile.patch"
#  content [d74002e21614e56da0231de0c350fd9ba669b9aa]
# 
# patch "packages/opkg/opkg-ipkg-compat.bb"
#  from [f9bba36069b6fa8993aa13524c9e9242cb594108]
#    to [9f4621f29e2e6cca79a62ab5543b5b9b2313dc3a]
# 
# patch "packages/opkg/opkg-native_svn.bb"
#  from [420b4102caa19ab8b18616eafcc931683bda822f]
#    to [35b5957b78efe09ebac1bd3a0a0717ae4c25798d]
# 
# patch "packages/opkg/opkg-nogpg-nocurl_svn.bb"
#  from [80320112589965ead6aad32429427c8b0c3849ed]
#    to [71b61d1ee7f1b19ed93a921889283a3ca24bd279]
# 
# patch "packages/opkg/opkg-nogpg_svn.bb"
#  from [c59372b144ab3578b89d47e160a58292ac884e68]
#    to [936236b1cd1dc75dd1c7eb7b49e24289f5c20d6c]
# 
# patch "packages/opkg/opkg-sdk_svn.bb"
#  from [156b8718e5e00225d312dbd09f391d28045acc65]
#    to [bf1af925bb03743274149e1fca7d87690d662010]
# 
# patch "packages/opkg/opkg.inc"
#  from [73c2d4cf20c0434a094b2f11fdf8df4745304ee6]
#    to [0757938331afffb66ac81045e52e87ec569d0b70]
#
============================================================
--- packages/opkg/files/opkg-gcc-4.3-compile.patch	d74002e21614e56da0231de0c350fd9ba669b9aa
+++ packages/opkg/files/opkg-gcc-4.3-compile.patch	d74002e21614e56da0231de0c350fd9ba669b9aa
@@ -0,0 +1,59 @@
+Index: opkg/libopkg/libopkg.c
+===================================================================
+--- opkg.orig/libopkg/libopkg.c	2008-09-13 19:57:17.000000000 -0700
++++ opkg/libopkg/libopkg.c	2008-09-13 19:58:32.000000000 -0700
+@@ -38,7 +38,7 @@
+           if ( level == OPKG_ERROR ){
+              push_error_list(&error_list, msg); 
+           } else
+-	     printf(msg);
++	     printf("%s\n",msg);
+      }
+      return 0;
+ }
+@@ -71,7 +71,7 @@
+ char* default_opkg_response_callback(char *question)
+ {
+      char *response = NULL;
+-     printf(question);
++     printf("%s\n", question);
+      fflush(stdout);
+      do {
+ 	  response = (char *)file_read_line_alloc(stdin);
+Index: opkg/libopkg/opkg_cmd.c
+===================================================================
+--- opkg.orig/libopkg/opkg_cmd.c	2008-09-13 19:58:54.000000000 -0700
++++ opkg/libopkg/opkg_cmd.c	2008-09-13 20:13:42.000000000 -0700
+@@ -380,7 +380,10 @@
+ 	perror (ctx->statedir);
+ 	
+     sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
+-    system (cmd);
++    if (system (cmd)) {
++        if (err == 0)
++	    err = errno;
++    }
+     free (cmd);
+ 
+     free (ctx->statedir);
+Index: opkg/libopkg/pkg.c
+===================================================================
+--- opkg.orig/libopkg/pkg.c	2008-09-13 20:14:12.000000000 -0700
++++ opkg/libopkg/pkg.c	2008-09-13 20:18:45.000000000 -0700
+@@ -1053,6 +1053,7 @@
+ void pkg_print_info(pkg_t *pkg, FILE *file)
+ {
+      char * buff;
++     int ret = 0;
+      if (pkg == NULL) {
+ 	return;
+      }
+@@ -1061,7 +1062,7 @@
+      if ( buff == NULL ) 
+          return;
+      if (strlen(buff)>2){
+-         fwrite(buff, 1, strlen(buff), file);
++         ret = fwrite(buff, 1, strlen(buff), file);
+      } 
+      free(buff);
+ }
============================================================
--- packages/opkg/opkg-ipkg-compat.bb	f9bba36069b6fa8993aa13524c9e9242cb594108
+++ packages/opkg/opkg-ipkg-compat.bb	9f4621f29e2e6cca79a62ab5543b5b9b2313dc3a
@@ -1,7 +1,7 @@ RDEPENDS = "opkg ipkg ipkg-collateral"
 DESCRIPTION = "Files to make opkg and ipkg coexist"
 RDEPENDS = "opkg ipkg ipkg-collateral"
 
-PR = "r0"
+PR = "r1"
 PACKAGE_ARCH = "all"
 
 do_compile() {
============================================================
--- packages/opkg/opkg-native_svn.bb	420b4102caa19ab8b18616eafcc931683bda822f
+++ packages/opkg/opkg-native_svn.bb	35b5957b78efe09ebac1bd3a0a0717ae4c25798d
@@ -1,7 +1,7 @@ DEPENDS = "curl-native"
 require opkg.inc
 
 DEPENDS = "curl-native"
-PR = "r2"
+PR = "r3"
 
 target_libdir := "${libdir}"
 
============================================================
--- packages/opkg/opkg-nogpg-nocurl_svn.bb	80320112589965ead6aad32429427c8b0c3849ed
+++ packages/opkg/opkg-nogpg-nocurl_svn.bb	71b61d1ee7f1b19ed93a921889283a3ca24bd279
@@ -6,7 +6,7 @@ SRC_URI += "file://opkg_wget.patch;patch
 SRC_URI += "file://opkg_wget.patch;patch=1 \
 	    file://reduce-nogpg-noise.patch;patch=1 \
 	   "
-PR = "r0"
+PR = "r1"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
============================================================
--- packages/opkg/opkg-nogpg_svn.bb	c59372b144ab3578b89d47e160a58292ac884e68
+++ packages/opkg/opkg-nogpg_svn.bb	936236b1cd1dc75dd1c7eb7b49e24289f5c20d6c
@@ -4,7 +4,7 @@ SRC_URI += "file://reduce-nogpg-noise.pa
 PROVIDES += "opkg"
 
 SRC_URI += "file://reduce-nogpg-noise.patch;patch=1"
-PR = "r1"
+PR = "r2"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
============================================================
--- packages/opkg/opkg-sdk_svn.bb	156b8718e5e00225d312dbd09f391d28045acc65
+++ packages/opkg/opkg-sdk_svn.bb	bf1af925bb03743274149e1fca7d87690d662010
@@ -1,7 +1,7 @@ DEPENDS = "curl-sdk"
 require opkg.inc
 
 DEPENDS = "curl-sdk"
-PR = "r1"
+PR = "r2"
 
 inherit sdk
 
============================================================
--- packages/opkg/opkg.inc	73c2d4cf20c0434a094b2f11fdf8df4745304ee6
+++ packages/opkg/opkg.inc	0757938331afffb66ac81045e52e87ec569d0b70
@@ -6,7 +6,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
 PV = "0.1.4+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \
-           file://fix_endianness.patch;patch=1;maxrev=4246"
+		   file://fix_endianness.patch;patch=1;maxrev=4246 \
+		   file://opkg-gcc-4.3-compile.patch;patch=1 \
+		  "
 S = "${WORKDIR}/opkg"
 
 inherit autotools pkgconfig