summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-08-14 13:05:20 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-08-14 13:05:20 +0000
commite59bca05aba9cb7b3ddc52a6484984b163781c3f (patch)
tree0cefd415ed6a0a38320db4315b2026f2571d892c
parent3f79d604acc2dda033f33951b67efb4a1dc5761b (diff)
downloadmake-e59bca05aba9cb7b3ddc52a6484984b163781c3f.tar.gz
morphs: convert to YAML
-rw-r--r--make.morph13
-rw-r--r--stage2-make.morph22
2 files changed, 15 insertions, 20 deletions
diff --git a/make.morph b/make.morph
index 466a8629..1259b342 100644
--- a/make.morph
+++ b/make.morph
@@ -1,8 +1,5 @@
-{
- "name": "make",
- "kind": "chunk",
- "build-system": "autotools",
- "configure-commands": [
- "./configure --prefix=\"$PREFIX\" --disable-nls"
- ]
-}
+name: make
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/stage2-make.morph b/stage2-make.morph
index e204fd8c..81819902 100644
--- a/stage2-make.morph
+++ b/stage2-make.morph
@@ -1,12 +1,10 @@
-{
- "name": "stage2-make",
- "kind": "chunk",
- "build-system": "autotools",
- "configure-commands": [
- "stage2-eglibc-fix-specs",
- "STAGE2_SYSROOT=\"$(dirname $(pwd))\" CPPFLAGS=\"--sysroot=$STAGE2_SYSROOT\" CXX=false LDFLAGS=\"-Wl,--sysroot=$STAGE2_SYSROOT\" ./configure --prefix=\"$PREFIX\" --disable-nls --build=$(sh config/config.guess) --host=$TARGET_STAGE1"
- ],
- "build-commands": [
- "STAGE2_SYSROOT=\"$(dirname $(pwd))\" make"
- ]
-}
+name: stage2-make
+kind: chunk
+build-system: autotools
+configure-commands:
+- stage2-eglibc-fix-specs
+- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+ LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+ --build=$(sh config/config.guess) --host=$TARGET_STAGE1
+build-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" make