From e59bca05aba9cb7b3ddc52a6484984b163781c3f Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Wed, 14 Aug 2013 13:05:20 +0000 Subject: morphs: convert to YAML --- make.morph | 13 +++++-------- stage2-make.morph | 22 ++++++++++------------ 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 -- cgit v1.2.1