[PATCH] gnutls_2.10.2.bb: Fix parallel build failure.

[PATCH] gnutls_2.10.2.bb: Fix parallel build failure.

[Graham Gower]

In file included from core.c:32:
enums.h:3:1: error: unterminated #ifndef
In file included from core.c:40:
enum-map.i.c:867:1: error: unterminated argument list invoking macro "SCM_SMOB_PRINT"
In file included from errors.c:28:
enums.h:3:1: error: unterminated #ifndef

Signed-off-by: Graham Gower <graham.gower@gmail.com>
---
 recipes/gnutls/gnutls-2.10.2/parallel-build.patch |   15 +++++++++++++++
 recipes/gnutls/gnutls_2.10.2.bb                   |    3 ++-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 recipes/gnutls/gnutls-2.10.2/parallel-build.patch

diff --git a/recipes/gnutls/gnutls-2.10.2/parallel-build.patch b/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
new file mode 100644
index 0000000..d170c4f
--- /dev/null
+++ b/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
@@ -0,0 +1,15 @@
+Upstream: http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=23f761290ca6f905f062d2de217acb012e5a38b2
+
+diff --git a/guile/src/Makefile.am.orig b/guile/src/Makefile.am
+index e8e81b1..2ee1297 100644
+--- a/guile/src/Makefile.am.orig
++++ b/guile/src/Makefile.am
+@@ -122,7 +122,7 @@ extra-smob-types.i.c: $(srcdir)/make-smob-types.scm
+ snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	       $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
+ 
+-.c.x:
++.c.x: $(BUILT_SOURCES)
+ 	$(guile_snarf) -o $@ $< $(snarfcppopts)
+ 
+ # Target used by doc/Makefile, to create all built sources necessary
diff --git a/recipes/gnutls/gnutls_2.10.2.bb b/recipes/gnutls/gnutls_2.10.2.bb
index 97a3c11..8af70ec 100644
--- a/recipes/gnutls/gnutls_2.10.2.bb
+++ b/recipes/gnutls/gnutls_2.10.2.bb
@@ -1,6 +1,6 @@
 require gnutls.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 LICENSE_${PN}-extra = "GPLv3"
 
@@ -9,6 +9,7 @@ EXTRA_OECONF += " --without-libgcrypt-prefix "
 SRC_URI += "file://gettextize-with-gettext-0.18.patch \
             file://gnutls-openssl.patch \
             file://gnutls-replace-siginterrupt.patch \
+            file://parallel-build.patch \
            "
 
 do_configure_prepend() {
-- 
1.7.1

Re: [PATCH] gnutls_2.10.2.bb: Fix parallel build failure.

[Khem Raj]

On Tue, Nov 23, 2010 at 3:00 PM, Graham Gower <graham.gower@gmail.com> wrote:
>
> In file included from core.c:32:
> enums.h:3:1: error: unterminated #ifndef
> In file included from core.c:40:
> enum-map.i.c:867:1: error: unterminated argument list invoking macro "SCM_SMOB_PRINT"
> In file included from errors.c:28:
> enums.h:3:1: error: unterminated #ifndef
>
> Signed-off-by: Graham Gower <graham.gower@gmail.com>

did you send this to gnutl upstream ml ? what do they have to say about it ?
patch look ok to me though

> ---
>  recipes/gnutls/gnutls-2.10.2/parallel-build.patch |   15 +++++++++++++++
>  recipes/gnutls/gnutls_2.10.2.bb                   |    3 ++-
>  2 files changed, 17 insertions(+), 1 deletions(-)
>  create mode 100644 recipes/gnutls/gnutls-2.10.2/parallel-build.patch
>
> diff --git a/recipes/gnutls/gnutls-2.10.2/parallel-build.patch b/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
> new file mode 100644
> index 0000000..d170c4f
> --- /dev/null
> +++ b/recipes/gnutls/gnutls-2.10.2/parallel-build.patch
> @@ -0,0 +1,15 @@
> +Upstream: http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=23f761290ca6f905f062d2de217acb012e5a38b2
> +
> +diff --git a/guile/src/Makefile.am.orig b/guile/src/Makefile.am
> +index e8e81b1..2ee1297 100644
> +--- a/guile/src/Makefile.am.orig
> ++++ b/guile/src/Makefile.am
> +@@ -122,7 +122,7 @@ extra-smob-types.i.c: $(srcdir)/make-smob-types.scm
> + snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
> +              $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
> +
> +-.c.x:
> ++.c.x: $(BUILT_SOURCES)
> +       $(guile_snarf) -o $@ $< $(snarfcppopts)
> +
> + # Target used by doc/Makefile, to create all built sources necessary
> diff --git a/recipes/gnutls/gnutls_2.10.2.bb b/recipes/gnutls/gnutls_2.10.2.bb
> index 97a3c11..8af70ec 100644
> --- a/recipes/gnutls/gnutls_2.10.2.bb
> +++ b/recipes/gnutls/gnutls_2.10.2.bb
> @@ -1,6 +1,6 @@
>  require gnutls.inc
>
> -PR = "${INC_PR}.0"
> +PR = "${INC_PR}.1"
>
>  LICENSE_${PN}-extra = "GPLv3"
>
> @@ -9,6 +9,7 @@ EXTRA_OECONF += " --without-libgcrypt-prefix "
>  SRC_URI += "file://gettextize-with-gettext-0.18.patch \
>             file://gnutls-openssl.patch \
>             file://gnutls-replace-siginterrupt.patch \
> +            file://parallel-build.patch \
>            "
>
>  do_configure_prepend() {
> --
> 1.7.1
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: [PATCH] gnutls_2.10.2.bb: Fix parallel build failure.

[Graham Gower]

On 24 November 2010 09:54, Khem Raj <raj.khem@gmail.com> wrote:
> On Tue, Nov 23, 2010 at 3:00 PM, Graham Gower <graham.gower@gmail.com> wrote:
>>
>> In file included from core.c:32:
>> enums.h:3:1: error: unterminated #ifndef
>> In file included from core.c:40:
>> enum-map.i.c:867:1: error: unterminated argument list invoking macro "SCM_SMOB_PRINT"
>> In file included from errors.c:28:
>> enums.h:3:1: error: unterminated #ifndef
>>
>> Signed-off-by: Graham Gower <graham.gower@gmail.com>
>
> did you send this to gnutl upstream ml ? what do they have to say about it ?
> patch look ok to me though

Yes. See the link to the commit in my patch header.

ML post:
http://lists.gnu.org/archive/html/gnutls-devel/2010-11/msg00058.html

Re: [PATCH] gnutls_2.10.2.bb: Fix parallel build failure.

[Khem Raj]

On Tue, Nov 23, 2010 at 3:31 PM, Graham Gower <graham.gower@gmail.com> wrote:
> On 24 November 2010 09:54, Khem Raj <raj.khem@gmail.com> wrote:
>> On Tue, Nov 23, 2010 at 3:00 PM, Graham Gower <graham.gower@gmail.com> wrote:
>>>
>>> In file included from core.c:32:
>>> enums.h:3:1: error: unterminated #ifndef
>>> In file included from core.c:40:
>>> enum-map.i.c:867:1: error: unterminated argument list invoking macro "SCM_SMOB_PRINT"
>>> In file included from errors.c:28:
>>> enums.h:3:1: error: unterminated #ifndef
>>>
>>> Signed-off-by: Graham Gower <graham.gower@gmail.com>
>>
>> did you send this to gnutl upstream ml ? what do they have to say about it ?
>> patch look ok to me though
>
> Yes. See the link to the commit in my patch header.
>
> ML post:
> http://lists.gnu.org/archive/html/gnutls-devel/2010-11/msg00058.html

super. Just wanted to confirm.

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