[STABLE][PATCH] gsoap: actually stage headers and libraries..

[STABLE][PATCH] gsoap: actually stage headers and libraries..

[Jeremy Lainé]

From: Jeremy Lainé <jeremy.laine@m4x.org>


Signed-off-by: Jeremy Lainé <jeremy.laine@m4x.org>
---
 recipes/gsoap/gsoap_2.7.7.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/recipes/gsoap/gsoap_2.7.7.bb b/recipes/gsoap/gsoap_2.7.7.bb
index 21a0ace..83c7cbb 100644
--- a/recipes/gsoap/gsoap_2.7.7.bb
+++ b/recipes/gsoap/gsoap_2.7.7.bb
@@ -3,7 +3,7 @@ for the development of SOAP Web Services and clients."
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "gsoap-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz \
            file://rename_bogus_ldflags.patch;patch=1"
@@ -23,5 +23,9 @@ do_install_append() {
 	done
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}"
-- 
1.6.2.1

Re: [STABLE][PATCH] gsoap: actually stage headers and libraries..

[Denys Dmytriyenko]

On Mon, Apr 06, 2009 at 06:48:20PM +0200, Jeremy Lain?? wrote:
> From: Jeremy Lain?? <jeremy.laine@m4x.org>
> 
> 
> Signed-off-by: Jeremy Lain?? <jeremy.laine@m4x.org>
> ---
>  recipes/gsoap/gsoap_2.7.7.bb |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/gsoap/gsoap_2.7.7.bb b/recipes/gsoap/gsoap_2.7.7.bb
> index 21a0ace..83c7cbb 100644
> --- a/recipes/gsoap/gsoap_2.7.7.bb
> +++ b/recipes/gsoap/gsoap_2.7.7.bb
> @@ -3,7 +3,7 @@ for the development of SOAP Web Services and clients."
>  SECTION = "devel"
>  LICENSE = "GPL"
>  DEPENDS = "gsoap-native"
> -PR = "r2"
> +PR = "r3"
>  
>  SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz \
>             file://rename_bogus_ldflags.patch;patch=1"
> @@ -23,5 +23,9 @@ do_install_append() {
>  	done
>  }
>  
> +do_stage() {
> +	autotools_stage_all
> +}
> +

inherit autotools_stage?

>  PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
>  FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}"
> -- 
> 1.6.2.1

Re: [STABLE][PATCH] gsoap: actually stage headers and libraries..

[Jeremy Lainé]

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

> inherit autotools_stage?

Quite right. Attached is a better patch against stable which includes the LDFLAGS fixes
and the staging fix.

-- 
Jeremy LAINE
Bolloré telecom | 11bis, rue Scribe | F-75009 Paris

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gsoap_fixes.patch --]
[-- Type: text/x-patch; name="gsoap_fixes.patch", Size: 1493 bytes --]

From: Jeremy Lainé <jeremy.laine@m4x.org>

Signed-off-by: Jeremy Lainé <jeremy.laine@m4x.org>

diff --git a/recipes/gsoap/gsoap/rename_bogus_ldflags.patch b/recipes/gsoap/gsoap/rename_bogus_ldflags.patch
new file mode 100644
index 0000000..5e4a01c
--- /dev/null
+++ b/recipes/gsoap/gsoap/rename_bogus_ldflags.patch
@@ -0,0 +1,12 @@
+diff -urN gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am gsoap-2.7/soapcpp2/wsdl/Makefile.am
+--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am	2005-07-15 21:04:42.000000000 +0000
++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am	2009-04-06 14:22:23.000000000 +0000
+@@ -6,7 +6,7 @@
+ AUTOMAKE_OPTIONS = foreign 1.4
+ 
+ INCLUDES=-I$(top_builddir)/soapcpp2
+-LDFLAGS=$(INCLUDES)
++AM_LDFLAGS=$(INCLUDES)
+ SOAP=$(top_builddir)/soapcpp2/src/soapcpp2
+ SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.a
+ SOAP_CPP_SRC=wsdlC.cpp
diff --git a/recipes/gsoap/gsoap_2.7.7.bb b/recipes/gsoap/gsoap_2.7.7.bb
index dc6ff6e..19f5751 100644
--- a/recipes/gsoap/gsoap_2.7.7.bb
+++ b/recipes/gsoap/gsoap_2.7.7.bb
@@ -3,12 +3,13 @@ for the development of SOAP Web Services and clients."
 SECTION = "devel"
 LICENSE = "GPL"
 DEPENDS = "gsoap-native"
-PR = "r1"
+PR = "r4"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz \
+           file://rename_bogus_ldflags.patch;patch=1"
 S = "${WORKDIR}/gsoap-2.7"
 
-inherit autotools
+inherit autotools_stage
 
 PARALLEL_MAKE = ""
 

Re: [STABLE][PATCH] gsoap: actually stage headers and libraries..

[Denys Dmytriyenko]

On Wed, Apr 08, 2009 at 11:21:53AM +0200, Jeremy Lain?? wrote:
> > inherit autotools_stage?
> 
> Quite right. Attached is a better patch against stable which includes the LDFLAGS fixes
> and the staging fix.

Overall it looks Ok to me. But I have 2 questions about a proper procedure:
- should the .dev have the same fix?
- should PR be incremented by 1?

> -- 
> Jeremy LAINE
> Bollor?? telecom | 11bis, rue Scribe | F-75009 Paris

> From: Jeremy Lain?? <jeremy.laine@m4x.org>
> 
> Signed-off-by: Jeremy Lain?? <jeremy.laine@m4x.org>
> 
> diff --git a/recipes/gsoap/gsoap/rename_bogus_ldflags.patch b/recipes/gsoap/gsoap/rename_bogus_ldflags.patch
> new file mode 100644
> index 0000000..5e4a01c
> --- /dev/null
> +++ b/recipes/gsoap/gsoap/rename_bogus_ldflags.patch
> @@ -0,0 +1,12 @@
> +diff -urN gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am gsoap-2.7/soapcpp2/wsdl/Makefile.am
> +--- gsoap-2.7.orig/soapcpp2/wsdl/Makefile.am	2005-07-15 21:04:42.000000000 +0000
> ++++ gsoap-2.7/soapcpp2/wsdl/Makefile.am	2009-04-06 14:22:23.000000000 +0000
> +@@ -6,7 +6,7 @@
> + AUTOMAKE_OPTIONS = foreign 1.4
> + 
> + INCLUDES=-I$(top_builddir)/soapcpp2
> +-LDFLAGS=$(INCLUDES)
> ++AM_LDFLAGS=$(INCLUDES)
> + SOAP=$(top_builddir)/soapcpp2/src/soapcpp2
> + SOAP_CPP_LIB=$(top_builddir)/soapcpp2/libgsoap++.a
> + SOAP_CPP_SRC=wsdlC.cpp
> diff --git a/recipes/gsoap/gsoap_2.7.7.bb b/recipes/gsoap/gsoap_2.7.7.bb
> index dc6ff6e..19f5751 100644
> --- a/recipes/gsoap/gsoap_2.7.7.bb
> +++ b/recipes/gsoap/gsoap_2.7.7.bb
> @@ -3,12 +3,13 @@ for the development of SOAP Web Services and clients."
>  SECTION = "devel"
>  LICENSE = "GPL"
>  DEPENDS = "gsoap-native"
> -PR = "r1"
> +PR = "r4"
>  
> -SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz"
> +SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz \
> +           file://rename_bogus_ldflags.patch;patch=1"
>  S = "${WORKDIR}/gsoap-2.7"
>  
> -inherit autotools
> +inherit autotools_stage
>  
>  PARALLEL_MAKE = ""
>  

> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: [STABLE][PATCH] gsoap: actually stage headers and libraries..

[Jeremy Lainé]

> Overall it looks Ok to me. But I have 2 questions about a proper procedure:
> - should the .dev have the same fix?
> - should PR be incremented by 1?

Yes, the dev branch has the exact same .bb file. In fact the patch is simply the diff
between stable and dev.

-- 
Jeremy LAINE
Bolloré telecom | 11bis, rue Scribe | F-75009 Paris

Re: [STABLE][PATCH] gsoap: actually stage headers and libraries..

[Denys Dmytriyenko]

On Wed, Apr 08, 2009 at 10:04:54PM +0200, Jeremy Lain? wrote:
> > Overall it looks Ok to me. But I have 2 questions about a proper procedure:
> > - should the .dev have the same fix?
> > - should PR be incremented by 1?
> 
> Yes, the dev branch has the exact same .bb file. In fact the patch is simply the diff
> between stable and dev.

Sorry, I missed it in .dev - both questions retracted.

Acked-by: Denys Dmytriyenko <denis@denix.org>

-- 
Denys