Patchwork wvstreams: add patch to add missing header includes

login
register
mail settings
Submitter Paul Menzel
Date April 22, 2011, 7:51 p.m.
Message ID <1303501867.4155.11.camel@mattotaupa>
Download mbox | patch
Permalink /patch/2709/
State Accepted
Commit 3cb4c65dbd0fba178208bc908ce93e6b1ae9fe9b
Headers show

Comments

Paul Menzel - April 22, 2011, 7:51 p.m.
From: Søren Holm <soeren.holm@mikrofyn.com>
Date: Wed, 20 Apr 2011 09:48:43 +0200

Building fails with the following error.

| ./CXX -c ipstreams/wvunixdgsocket
| In file included from ./include/wvunixdgsocket.h:13:0,
|                  from ipstreams/wvunixdgsocket.cc:1:
| ./include/wvaddr.h: In member function 'uint32_t WvIPAddr::addr() const':
| ./include/wvaddr.h:284:31: warning: dereferencing type-punned pointer will break strict-aliasing rules
| ipstreams/wvunixdgsocket.cc: In constructor 'WvUnixDGSocket::WvUnixDGSocket(const WvFastString&, bool, int)':
| ipstreams/wvunixdgsocket.cc:50:32: error: 'chmod' was not declared in this scope
| make: *** [ipstreams/wvunixdgsocket.o] Error 1

This patch is build tested using `angstrom-2010.x` and `minimal` for `MACHINE = "beagleboard"`. The build still fails when uClibc is used.

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
CC: Søren Holm <soeren.holm@mikrofyn.com>
CC: Khem Raj <raj.khem@gmail.com>
---
1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].
2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
3. Søren, please send your patch upstream.
4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.
5. Søren, I removed `apply=yes` since that is the default.

[1] http://openembedded.org/index.php/Commit_Policy
---
 .../files/0001-Fixed-missing-header-includes.patch |   37 ++++++++++++++++++++
 recipes/wvstreams/wvstreams_4.6.bb                 |    1 +
 2 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
Khem Raj - April 23, 2011, midnight
On Fri, Apr 22, 2011 at 12:51 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> From: Søren Holm <soeren.holm@mikrofyn.com>
> Date: Wed, 20 Apr 2011 09:48:43 +0200
>
> Building fails with the following error.
>
> | ./CXX -c ipstreams/wvunixdgsocket
> | In file included from ./include/wvunixdgsocket.h:13:0,
> |                  from ipstreams/wvunixdgsocket.cc:1:
> | ./include/wvaddr.h: In member function 'uint32_t WvIPAddr::addr() const':
> | ./include/wvaddr.h:284:31: warning: dereferencing type-punned pointer will break strict-aliasing rules
> | ipstreams/wvunixdgsocket.cc: In constructor 'WvUnixDGSocket::WvUnixDGSocket(const WvFastString&, bool, int)':
> | ipstreams/wvunixdgsocket.cc:50:32: error: 'chmod' was not declared in this scope
> | make: *** [ipstreams/wvunixdgsocket.o] Error 1
>
> This patch is build tested using `angstrom-2010.x` and `minimal` for `MACHINE = "beagleboard"`. The build still fails when uClibc is used.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> CC: Søren Holm <soeren.holm@mikrofyn.com>
> CC: Khem Raj <raj.khem@gmail.com>

Looks ok to me.

Acked-by: Khem Raj <raj.khem@gmail.com>

> ---
> 1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].
> 2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
> 3. Søren, please send your patch upstream.
> 4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.
> 5. Søren, I removed `apply=yes` since that is the default.
>
> [1] http://openembedded.org/index.php/Commit_Policy
> ---
>  .../files/0001-Fixed-missing-header-includes.patch |   37 ++++++++++++++++++++
>  recipes/wvstreams/wvstreams_4.6.bb                 |    1 +
>  2 files changed, 38 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
>
> diff --git a/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch b/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
> new file mode 100644
> index 0000000..f6d99f0
> --- /dev/null
> +++ b/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
> @@ -0,0 +1,37 @@
> +From d76ec92a9e09fefa3083250f4aa588d0e94fe20c Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?S=C3=B8ren=20Holm?= <sh@mikrofyn.com>
> +Date: Wed, 20 Apr 2011 09:41:22 +0200
> +Subject: [PATCH] Fixed missing header includes.
> +
> +---
> + ipstreams/wvunixdgsocket.cc |    2 +-
> + streams/wvatomicfile.cc     |    2 +-
> + 2 files changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/ipstreams/wvunixdgsocket.cc b/ipstreams/wvunixdgsocket.cc
> +index 41d2911..6dc12fc 100644
> +--- a/ipstreams/wvunixdgsocket.cc
> ++++ b/ipstreams/wvunixdgsocket.cc
> +@@ -1,5 +1,5 @@
> + #include "wvunixdgsocket.h"
> +-#ifdef MACOS
> ++#if defined(MACOS) || defined(__GNUC__)
> + #include <sys/types.h>
> + #include <sys/stat.h>
> + #endif
> +diff --git a/streams/wvatomicfile.cc b/streams/wvatomicfile.cc
> +index 65ae202..0a58069 100644
> +--- a/streams/wvatomicfile.cc
> ++++ b/streams/wvatomicfile.cc
> +@@ -11,7 +11,7 @@
> + #include "wvfileutils.h"
> + #include "wvstrutils.h"
> +
> +-#ifdef MACOS
> ++#if defined(MACOS) || defined(__GNUC__)
> + #include <sys/stat.h>
> + #endif
> +
> +--
> +1.7.4.1
> +
> diff --git a/recipes/wvstreams/wvstreams_4.6.bb b/recipes/wvstreams/wvstreams_4.6.bb
> index 1c11268..0eb0198 100644
> --- a/recipes/wvstreams/wvstreams_4.6.bb
> +++ b/recipes/wvstreams/wvstreams_4.6.bb
> @@ -6,6 +6,7 @@ DEPENDS = "zlib openssl (>= 0.9.8)"
>  PR = "r1"
>
>  SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
> +       file://0001-Fixed-missing-header-includes.patch \
>        "
>
>  inherit autotools pkgconfig
> --
> 1.7.4.4
>
Søren Holm - April 23, 2011, 11:08 a.m.
Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
> 1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].

I kind of novice into this. How do I add my signed-off line ?

> 2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
> 3. Søren, please send your patch upstream.
> 4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.

will do

> 5. Søren, I removed `apply=yes` since that is the default.

great.


btw. The emaileaddress mixup won't happen again.

--
Søren Holm
Paul Menzel - April 23, 2011, 11:46 a.m.
Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
> Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
> > 1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].
> 
> I kind of novice into this. How do I add my signed-off line ?

When committing the change, just add the option `-s` and it is added
automatically by what you have configured using `git config`.

For now, you can just reply to this message and add that line where you
like.

I will add it to the commit message using `git commit --amend`.

> > 2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
> > 3. Søren, please send your patch upstream.
> > 4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.
> 
> will do
> 
> > 5. Søren, I removed `apply=yes` since that is the default.
> 
> great.
> 
> btw. The emaileaddress mixup won't happen again.

Just tell me what the correct one is and I will push your patch.


Thanks,

Paul
Søren Holm - April 23, 2011, 12:04 p.m.
Lørdag den 23. april 2011 13:46:02 skrev Paul Menzel:
> Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
> > Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
> > > 1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].
> > 
> > I kind of novice into this. How do I add my signed-off line ?
> 
> When committing the change, just add the option `-s` and it is added
> automatically by what you have configured using `git config`.
> 
> For now, you can just reply to this message and add that line where you
> like.


Signed-off-by: Søren Holm <sgh@sgh.dk>

I rebased my branch at github repo to master. Now ait lso contains a 4.6.1 recipe if your would like.
I added my Signed-Off to both commits there also.

> 
> I will add it to the commit message using `git commit --amend`.
> 
> > > 2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
> > > 3. Søren, please send your patch upstream.
> > > 4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.
> > 
> > will do
> > 
> > > 5. Søren, I removed `apply=yes` since that is the default.
> > 
> > great.
> > 
> > btw. The emaileaddress mixup won't happen again.
> 
> Just tell me what the correct one is and I will push your patch.
> 
> 
> Thanks,
> 
> Paul
>
Paul Menzel - April 25, 2011, 2:48 p.m.
Am Samstag, den 23.04.2011, 14:04 +0200 schrieb Søren Holm:
> Lørdag den 23. april 2011 13:46:02 skrev Paul Menzel:
> > Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
> > > Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
> > > > 1. Søren, please add your Signed-off-by line in front of mine. This is a demanded by the commit policy [1].
> > > 
> > > I kind of novice into this. How do I add my signed-off line ?
> > 
> > When committing the change, just add the option `-s` and it is added
> > automatically by what you have configured using `git config`.
> > 
> > For now, you can just reply to this message and add that line where you
> > like.
> 
> Signed-off-by: Søren Holm <sgh@sgh.dk>
> 
> I rebased my branch at github repo to master. Now ait lso contains a 4.6.1 recipe if your would like.
> I added my Signed-Off to both commits there also.
>
> > I will add it to the commit message using `git commit --amend`.
> > 
> > > > 2. I am adding Khem, since he seems to be the original author of this patch. It would be great to get his Acked-by too.
> > > > 3. Søren, please send your patch upstream.
> > > > 4. Søren, when you have a little time it would be great if you could update WvStreams to 4.6.1 and test it.
> > > 
> > > will do
> > > 
> > > > 5. Søren, I removed `apply=yes` since that is the default.
> > > 
> > > great.
> > > 
> > > btw. The emaileaddress mixup won't happen again.
> > 
> > Just tell me what the correct one is and I will push your patch.

I pushed this commit yesterday [1]. I am sorry I messed up and omitted
the commit summary.


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=3cb4c65dbd0fba178208bc908ce93e6b1ae9fe9b

Patch

diff --git a/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch b/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
new file mode 100644
index 0000000..f6d99f0
--- /dev/null
+++ b/recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch
@@ -0,0 +1,37 @@ 
+From d76ec92a9e09fefa3083250f4aa588d0e94fe20c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=B8ren=20Holm?= <sh@mikrofyn.com>
+Date: Wed, 20 Apr 2011 09:41:22 +0200
+Subject: [PATCH] Fixed missing header includes.
+
+---
+ ipstreams/wvunixdgsocket.cc |    2 +-
+ streams/wvatomicfile.cc     |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ipstreams/wvunixdgsocket.cc b/ipstreams/wvunixdgsocket.cc
+index 41d2911..6dc12fc 100644
+--- a/ipstreams/wvunixdgsocket.cc
++++ b/ipstreams/wvunixdgsocket.cc
+@@ -1,5 +1,5 @@
+ #include "wvunixdgsocket.h"
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #endif
+diff --git a/streams/wvatomicfile.cc b/streams/wvatomicfile.cc
+index 65ae202..0a58069 100644
+--- a/streams/wvatomicfile.cc
++++ b/streams/wvatomicfile.cc
+@@ -11,7 +11,7 @@
+ #include "wvfileutils.h"
+ #include "wvstrutils.h"
+ 
+-#ifdef MACOS
++#if defined(MACOS) || defined(__GNUC__)
+ #include <sys/stat.h>
+ #endif
+ 
+-- 
+1.7.4.1
+
diff --git a/recipes/wvstreams/wvstreams_4.6.bb b/recipes/wvstreams/wvstreams_4.6.bb
index 1c11268..0eb0198 100644
--- a/recipes/wvstreams/wvstreams_4.6.bb
+++ b/recipes/wvstreams/wvstreams_4.6.bb
@@ -6,6 +6,7 @@  DEPENDS = "zlib openssl (>= 0.9.8)"
 PR = "r1"
 
 SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
+	file://0001-Fixed-missing-header-includes.patch \
 	"
 
 inherit autotools pkgconfig