Skip to contentSkip to conversation

gnutls_2.10.2.bb: Fix parallel build failure.

PATCH In review Graham Gower 2 participants 4 messages Nov 23, 2010 – Nov 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gnutls_2.10.2.bb: Fix parallel build failure.

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

---
 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
recipes/gnutls/gnutls-2.10.2/parallel-build.patch new file +15 -0
new file mode 100644
index 0000000..d170c4f
@@ -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
recipes/gnutls/gnutls_2.10.2.bb +2 -1
index 97a3c11..8af70ec 100644
@@ -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() {
Signature · 1 line
1.7.1
#1 lore raw
Quoted 9 lines · 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

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

Quoted 56 lines

---
 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

recipes/gnutls/gnutls-2.10.2/parallel-build.patch new file +15 -0
new file mode 100644
index 0000000..d170c4f
@@ -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
recipes/gnutls/gnutls_2.10.2.bb +0 -0
index 97a3c11..8af70ec 100644
@@ -1,6 +1,6 @@

 require gnutls.inc

recipes/gnutls/gnutls_2.10.2.bb +1 -1
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"

 LICENSE_${PN}-extra = "GPLv3"

recipes/gnutls/gnutls_2.10.2.bb +1 -0
@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

#2 lore raw
Quoted 9 lines · Khem Raj
Quoted 8 lines · 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

Quoted 4 lines
Quoted 1 line

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

#3 lore raw
Quoted 12 lines · Graham Gower
Quoted 11 lines · Khem Raj
Quoted 9 lines · 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

Quoted 7 lines
Quoted 2 lines

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.

Quoted 6 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel