From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [209.85.198.248] (helo=rv-out-0708.google.com) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1KerkA-0006v3-Eh for openembedded-devel@lists.openembedded.org; Sun, 14 Sep 2008 15:34:26 +0200 Received: by rv-out-0708.google.com with SMTP id f25so2201568rvb.12 for ; Sun, 14 Sep 2008 06:31:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=iZsyPtzikGH+qJEXQkGS7FCzLik+rArjgn8ZMOSMjuM=; b=Prgdb30fbg3eWK/auMqVzI4EOwjuFYA3UW2b/HQCUy7bCzwMCQi/lZeK2gEitNKxoA 0Lm6QKVAvxbfnZKrVu4Z8fkboQyZbKp4Pk44Rcn3lz5Qefqnow773nvT9WlVgWHmN2jD omtnET0M1r/kcmQ23p4x3tNSrAtCLsTNO2Rlc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=SzijT/U87Fi5pQGOPR4T7z3+WEjB8A48UqYTZQ10LjOatK+mJXaDS9lH3K3Xt99q0P U4JkDggGqMSrcPWvfL/CMqLPGLJJAVn/hByWPNLhjAJDDvlkWCMr7nxO7qSpCLL12Tee tYOrkejBJiGcs6r2KtX27SaJxlgLTBAt/6fYk= Received: by 10.114.127.1 with SMTP id z1mr5188716wac.94.1221399092054; Sun, 14 Sep 2008 06:31:32 -0700 (PDT) Received: from localhost ( [71.146.23.38]) by mx.google.com with ESMTPS id z20sm25652160pod.11.2008.09.14.06.31.31 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 14 Sep 2008 06:31:31 -0700 (PDT) Date: Sun, 14 Sep 2008 06:31:28 -0700 From: Khem Raj To: openembedded-devel@lists.openembedded.org Message-ID: <20080914133128.GA21462@gmail.com> MIME-Version: 1.0 User-Agent: Mutt/1.5.18 (2008-05-17) Subject: [patch] compile opkg-sdk-native with gcc 4.3 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Sep 2008 13:34:26 -0000 X-Groupsio-MsgNum: 5886 Content-Type: multipart/mixed; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=diff # # 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 --mYCpIKhGyMATD0i+--