Please pull 'to-upstream' of http://sgh.dk/~sgh/oe.git
commit 59c811aaebd84424451058f019aaa32c257e4fc1
Author: Søren Holm <[email protected]> Date: Wed Apr 20 09:48:43 2011 +0200
wvstreams: Added patch to fix compilation.
.../files/0001-Fixed-missing-header-includes.patch | 37 ++++++++++++++++++++ recipes/wvstreams/wvstreams_4.6.bb | 1 + 2 files changed, 38 insertions(+), 0 deletions(-)
Signature · 1 line
Søren Holm
Dear Søren,
thank you for your patch.
Unfortunately
$ git remote add wvstream http://sgh.dk/~sgh/oe.git $ git fetch wvstream # lasts forever/times out
does not work.
Naming the branch descriptively, for example »wvstream-fix« would also help in my opinion.
Am Mittwoch, den 20.04.2011, 10:07 +0200 schrieb Søren Holm:
Quoted 5 lines
commit
59c811aaebd84424451058f019aaa32c257e4fc1Author: Søren Holm <[email protected]> Date: Wed Apr 20 09:48:43 2011 +0200wvstreams: Added patch to fix compilation.
Please add an excerpt from the error message to the commit message.
| ./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
Quoted 2 lines
.../files/0001-Fixed-missing-header-includes.patch | 37++++++++++++++++++++
please turn off line wrapping for pasted sections.
Quoted 2 lines
recipes/wvstreams/wvstreams_4.6.bb | 1 + 2 files changed, 38 insertions(+), 0 deletions(-)
Could next time, please also send the patches to the list. This way, our patch queue Patchwork [1] can keep track of it. There should be some kind of option.
Thanks,
Paul
Re: Please pull 'wvstreams-fixes' of http://sgh.dk/~sgh/oe.git
Hej Paul
The server should be responding now.
I added the compiler error to the commit and changed the branchname.
You could consider to do :
$ git fetch http://sgh.dk/~sgh/oe.git wvstreams-fixes
the fetched HEAD will then end in the FETCH_HEAD refname.
Onsdag 20 april 2011 11:47:20 skrev Paul Menzel:
Quoted 44 lines
Dear Søren,
thank you for your patch.
Unfortunately
$ git remote add wvstream http://sgh.dk/~sgh/oe.git $ git fetch wvstream # lasts forever/times outdoes not work.
Naming the branch descriptively, for example »wvstream-fix« would also help in my opinion.
Am Mittwoch, den 20.04.2011, 10:07 +0200 schrieb Søren Holm:
Quoted 5 lines
commit
59c811aaebd84424451058f019aaa32c257e4fc1Author: Søren Holm <[email protected]> Date: Wed Apr 20 09:48:43 2011 +0200wvstreams: Added patch to fix compilation.
Please add an excerpt from the error message to the commit message.
| ./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 |Quoted 3 lines
.../files/0001-Fixed-missing-header-includes.patch | 37++++++++++++++++++++
please turn off line wrapping for pasted sections.
Quoted 2 lines
recipes/wvstreams/wvstreams_4.6.bb | 1 + 2 files changed, 38 insertions(+), 0 deletions(-)Could next time, please also send the patches to the list. This way, our patch queue Patchwork [1] can keep track of it. There should be some kind of option.
Signature · 1 line
Søren Holm
Re: Please pull 'wvstreams-fixes' of http://sgh.dk/~sgh/oe.git
Dear Søren,
Am Mittwoch, den 20.04.2011, 12:19 +0200 schrieb Søren Holm:
Quoted 1 line
The server should be responding now.
I am now getting the following error.
$ git fetch http://sgh.dk/~sgh/oe.git wvstreams-fixes error: Unable to find a76908145053c3f4a90988ce4c6e312fa7578e42 under http://sgh.dk/~sgh/oe.git Cannot obtain needed object a76908145053c3f4a90988ce4c6e312fa7578e42 error: Fetch failed.
Quoted 1 line
I added the compiler error to the commit and changed the branchname.
Thank you.
Quoted 4 lines
You could consider to do :
$ git fetch http://sgh.dk/~sgh/oe.git wvstreams-fixesthe fetched HEAD will then end in the
FETCH_HEADrefname.
Thank you very much for the hint. I should send a patch to the Git developers to add that to the example section.
Thanks,
Paul
Re: Please pull 'wvstreams-fixes' of http://sgh.dk/~sgh/oe.git
Hi Paul
Please use this url instead. Somehow http export is not working.
git://github.com/sgh/oe.git
Onsdag 20 april 2011 12:45:45 skrev Paul Menzel:
Quoted 11 lines
Am Mittwoch, den 20.04.2011, 12:19 +0200 schrieb Søren Holm:
Quoted 1 line
The server should be responding now.
I am now getting the following error.
$ git fetch http://sgh.dk/~sgh/oe.git wvstreams-fixes error: Unable to find a76908145053c3f4a90988ce4c6e312fa7578e42 under http://sgh.dk/~sgh/oe.git Cannot obtain needed object a76908145053c3f4a90988ce4c6e312fa7578e42 error: Fetch failed.
Signature · 1 line
Søren Holm
Re: Please pull 'wvstreams-fixes' of http://sgh.dk/~sgh/oe.git
Dear Søren,
Am Mittwoch, den 20.04.2011, 14:05 +0200 schrieb Søren Holm:
Quoted 3 lines
Please use this url instead. Somehow http export is not working.
git://github.com/sgh/oe.git
thank you. That worked.
Thanks,
Paul
Re: Please pull 'wvstreams-fixes' of http://sgh.dk/~sgh/oe.git
Onsdag den 20. april 2011 15:38:12 skrev Paul Menzel:
Quoted 3 lines
thank you. That worked.
Will my change be merged in sometime soon. It is a rather simple change I think.
--
Søren Holm
PATCH 1/1 wvstreams: add patch to add missing header includes
In reply to Søren HolmFrom: Søren Holm <[email protected]>
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.
---
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
recipes/wvstreams/files/0001-Fixed-missing-header-includes.patch new file +37 -0
@@ -0,0 +1,37 @@ +From d76ec92a9e09fefa3083250f4aa588d0e94fe20c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Holm?= <[email protected]> +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 +
recipes/wvstreams/wvstreams_4.6.bb +1 -0
@@ -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
Signature · 1 line
1.7.4.4
Re: [PATCH] wvstreams: add patch to add missing header includes
Quoted 14 lines · Paul Menzel
From: Søren Holm <[email protected]>
Date: Wed, 20 Apr 2011 09:48:43 +0200Building 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
Quoted 5 lines
This patch is build tested using
angstrom-2010.xandminimalforMACHINE = "beagleboard". The build still fails when uClibc is used.Signed-off-by Paul Menzel <[email protected]>CC Søren Holm <[email protected]>CC Khem Raj <[email protected]>
Looks ok to me.
Quoted 72 lines
---
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 removedapply=yessince 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.patchrecipes/wvstreams/files/0001-Fixed-missing-header-includes.patch new file +37
-0@@ -0,0 +1,37 @@ +From d76ec92a9e09fefa3083250f4aa588d0e94fe20c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B8ren=20Holm?= <[email protected]> +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 +recipes/wvstreams/wvstreams_4.6.bb +0
-0@@ -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
Re: [PATCH] wvstreams: add patch to add missing header includes
In reply to Paul MenzelFredag den 22. april 2011 21:51:07 skrev Paul Menzel:
Quoted 1 line
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 ?
Quoted 3 lines
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
Quoted 1 line
5. Søren, I removed
apply=yessince that is the default.
great.
btw. The emaileaddress mixup won't happen again.
--
Søren Holm
Re: [PATCH] wvstreams: add patch to add missing header includes
Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
Quoted 4 lines
Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
Quoted 1 line
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.
Quoted 11 lines
Quoted 3 lines
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
Quoted 1 line
5. Søren, I removed
apply=yessince 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
Re: [PATCH] wvstreams: add patch to add missing header includes
Lørdag den 23. april 2011 13:46:02 skrev Paul Menzel:
Quoted 11 lines
Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
Quoted 4 lines
Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
Quoted 1 line
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
-sand it is added automatically by what you have configured usinggit config.For now, you can just reply to this message and add that line where you like.
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.
Quoted 22 lines
I will add it to the commit message using
git commit --amend.Quoted 11 lines
Quoted 3 lines
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
Quoted 1 line
5. Søren, I removed
apply=yessince 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
Re: [PATCH] wvstreams: add patch to add missing header includes
Am Samstag, den 23.04.2011, 14:04 +0200 schrieb Søren Holm:
Quoted 10 lines
Lørdag den 23. april 2011 13:46:02 skrev Paul Menzel:
Quoted 9 lines
Am Samstag, den 23.04.2011, 13:08 +0200 schrieb Søren Holm:
Quoted 4 lines
Fredag den 22. april 2011 21:51:07 skrev Paul Menzel:
Quoted 1 line
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
-sand it is added automatically by what you have configured usinggit config.
Quoted 23 lines
Quoted 2 lines
For now, you can just reply to this message and add that line where you like.
Signed-off-by Søren Holm <[email protected]>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.
Quoted 15 lines
I will add it to the commit message using
git commit --amend.Quoted 11 lines
Quoted 3 lines
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
Quoted 1 line
5. Søren, I removed
apply=yessince 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