From 53973f286bda45086deb932076d09997624804da Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Mon, 9 Feb 2009 11:10:17 +0000 Subject: opkg: fix build with gcc 4.3.2 opkg has the -Werror flag enabled and gcc 4.3.2 introduces new warnings. --- .../opkg/files/opkg-fix-gcc-warnings.patch | 53 ++++++++++++++++++++++ meta/packages/opkg/opkg.inc | 8 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 meta/packages/opkg/files/opkg-fix-gcc-warnings.patch (limited to 'meta/packages') diff --git a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch b/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch new file mode 100644 index 000000000..149542ed6 --- /dev/null +++ b/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch @@ -0,0 +1,53 @@ +diff -urN opkg.orig/libopkg/libopkg.c opkg/libopkg/libopkg.c +--- opkg.orig/libopkg/libopkg.c 2009-02-09 10:49:40.000000000 +0000 ++++ opkg/libopkg/libopkg.c 2009-02-09 10:50:23.000000000 +0000 +@@ -38,7 +38,7 @@ + if ( level == OPKG_ERROR ){ + push_error_list(&error_list, msg); + } else +- printf(msg); ++ printf("%s", msg); + } + return 0; + } +@@ -71,7 +71,7 @@ + char* default_opkg_response_callback(char *question) + { + char *response = NULL; +- printf(question); ++ printf("%s", question); + fflush(stdout); + do { + response = (char *)file_read_line_alloc(stdin); +diff -urN opkg.orig/libopkg/opkg_cmd.c opkg/libopkg/opkg_cmd.c +--- opkg.orig/libopkg/opkg_cmd.c 2009-02-09 10:49:40.000000000 +0000 ++++ opkg/libopkg/opkg_cmd.c 2009-02-09 10:50:23.000000000 +0000 +@@ -369,7 +369,7 @@ + perror (ctx->statedir); + + sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir); +- system (cmd); ++ err = system (cmd); + free (cmd); + + free (ctx->statedir); +diff -urN opkg.orig/libopkg/pkg.c opkg/libopkg/pkg.c +--- opkg.orig/libopkg/pkg.c 2009-02-09 10:49:40.000000000 +0000 ++++ opkg/libopkg/pkg.c 2009-02-09 10:52:49.000000000 +0000 +@@ -1052,6 +1052,7 @@ + + void pkg_print_info(pkg_t *pkg, FILE *file) + { ++ int t = 0; + char * buff; + if (pkg == NULL) { + return; +@@ -1061,7 +1062,7 @@ + if ( buff == NULL ) + return; + if (strlen(buff)>2){ +- fwrite(buff, 1, strlen(buff), file); ++ t = fwrite(buff, 1, strlen(buff), file); /* TODO: check t */ + } + free(buff); + } diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc index d131753dd..c2e840908 100644 --- a/meta/packages/opkg/opkg.inc +++ b/meta/packages/opkg/opkg.inc @@ -6,8 +6,14 @@ LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.0+svnr${SRCREV}" +# opkg-fix-gcc-warnings.patch: the patch is already upstreamed and could be +# taken out once okpg is updated to new repo +# http://opkg.googlecode.com/svn/trunk +# with rev >= 150 + SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \ - file://fix_prototype.patch;patch=1" + file://fix_prototype.patch;patch=1 \ + file://opkg-fix-gcc-warnings.patch;patch=1" S = "${WORKDIR}/opkg" -- cgit v1.2.3