summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch20
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.6.bb3
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch b/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch
new file mode 100644
index 0000000000..761d51b943
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/fix_parallel_build_issue.patch
@@ -0,0 +1,20 @@
+Add explicit dependency for libpath.h on dynl.x which fixes a potential parallel build issue.
+
+Fixes Yocto bug# 3558
+
+Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
+
+Upstream-Status: Pending
+
+diff --git a/libguile/Makefile.am b/libguile/Makefile.am
+index e216435..016bd90 100644
+--- a/libguile/Makefile.am
++++ b/libguile/Makefile.am
+@@ -700,6 +700,7 @@ $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in
+ error.x: cpp-E.c
+ posix.x: cpp-SIG.c
+ load.x: libpath.h
++dynl.x: libpath.h
+
+ alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
+ snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
diff --git a/meta/recipes-devtools/guile/guile_2.0.6.bb b/meta/recipes-devtools/guile/guile_2.0.6.bb
index 63ad263a07..10efc5221c 100644
--- a/meta/recipes-devtools/guile/guile_2.0.6.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.6.bb
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
file://guile_2.0.6_fix_sed_error.patch \
file://arm_endianness.patch \
file://change-install-data-hook-to-install-exec-hook-in-gui.patch \
+ file://fix_parallel_build_issue.patch \
"
# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
@@ -28,7 +29,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
SRC_URI[md5sum] = "3438cd4415c0c43ca93a20e845eba7e2"
SRC_URI[sha256sum] = "3ece055145a5020dd36b84f5fbccd4b3846a671960dd5ee55931555f03200950"
-PR = "r2"
+PR = "r3"
inherit autotools gettext
BBCLASSEXTEND = "native"