From f06f7489f224990b4c950e08edf16e713932f7a3 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 2 Jul 2013 09:06:25 +0000
Subject: Convert morphology to YAML

---
 perl.morph | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/perl.morph b/perl.morph
index ac0bf0254d..fac038c7f7 100644
--- a/perl.morph
+++ b/perl.morph
@@ -1,13 +1,20 @@
-{
-    "name": "perl",
-    "kind": "chunk",
-    "configure-commands": [
-        "sh Configure -des -Dprefix=\"$PREFIX\" -Darchlib=\"$PREFIX/lib/perl\" -Dprivlib=\"$PREFIX/share/perl\" -Dbin=\"$PREFIX/bin\" -Dscriptdir=\"$PREFIX/bin\" -Dman1dir=\"$PREFIX/share/man/man1\" -Dman3dir=\"$PREFIX/share/man/man3\" -Dsiteprefix=\"$PREFIX\" -Dsitearch=\"$PREFIX/lib/perl\" -Dsitelib=\"$PREFIX/share/perl\" -Dsitebin=\"$PREFIX/bin\" -Dsitescript=\"$PREFIX/bin\" -Dsiteman1dir=\"$PREFIX/share/man/man1\" -Dsiteman3dir=\"$PREFIX/share/man/man3\" -Dvendorprefix=\"$PREFIX\" -Dvendorarch=\"$PREFIX/lib/perl\" -Dvendorlib=\"$PREFIX/share/perl\" -Dvendorbin=\"$PREFIX/bin\" -Dvendorscript=\"$PREFIX/bin\" -Dvendorman1dir=\"$PREFIX/share/man/man1\" -Dvendorman3dir=\"$PREFIX/share/man/man3\" -Dpager=\"$PREFIX/bin/less -isR\" -Duseshrplib"
-    ],
-    "build-commands": [
-        "make"
-    ],
-    "install-commands": [
-        "make  DESTDIR=\"$DESTDIR\" install"
-    ]
-}
+name: perl
+kind: chunk
+configure-commands:
+- sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl"
+  -Dprivlib="$PREFIX/share/perl" -Dbin="$PREFIX/bin"
+  -Dscriptdir="$PREFIX/bin" -Dman1dir="$PREFIX/share/man/man1"
+  -Dman3dir="$PREFIX/share/man/man3" -Dsiteprefix="$PREFIX"
+  -Dsitearch="$PREFIX/lib/perl" -Dsitelib="$PREFIX/share/perl"
+  -Dsitebin="$PREFIX/bin" -Dsitescript="$PREFIX/bin"
+  -Dsiteman1dir="$PREFIX/share/man/man1"
+  -Dsiteman3dir="$PREFIX/share/man/man3"
+  -Dvendorprefix="$PREFIX" -Dvendorarch="$PREFIX/lib/perl"
+  -Dvendorlib="$PREFIX/share/perl" -Dvendorbin="$PREFIX/bin"
+  -Dvendorscript="$PREFIX/bin" -Dvendorman1dir="$PREFIX/share/man/man1"
+  -Dvendorman3dir="$PREFIX/share/man/man3" -Dpager="$PREFIX/bin/less
+  -isR" -Duseshrplib
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1


From 59896346ccb8d103126eff163b36c9e16f38e6c6 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Tue, 2 Jul 2013 09:09:22 +0000
Subject: morphology: disable parallel build

It causes non-deterministic build failures. While most have been
seen on ARM, it can happen on other architectures.
---
 perl.morph | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/perl.morph b/perl.morph
index fac038c7f7..54333d357d 100644
--- a/perl.morph
+++ b/perl.morph
@@ -1,5 +1,9 @@
 name: perl
 kind: chunk
+# There is a parallel build issue early in perl's build process.
+# This tends to only show up on ARM, but has been known to happen
+# on other architectures.
+max-jobs: 1
 configure-commands:
 - sh Configure -des -Dprefix="$PREFIX" -Darchlib="$PREFIX/lib/perl"
   -Dprivlib="$PREFIX/share/perl" -Dbin="$PREFIX/bin"
-- 
cgit v1.2.1