summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2013-08-23 14:36:38 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2013-08-23 14:36:38 +0000
commit6a0eb04c3d2ac24d80d505b42a8f67799487d133 (patch)
treef13737f5a70c4da25bf621bd55f57ecd3273fcf9
parent4c24797ccf44547e8b394163eb6692e73344f4f5 (diff)
parent4330778a0ef785d60baa9257e760be0ba02767b3 (diff)
downloadgawk-baserock/build-essential.tar.gz
Merge branch 'baserock/richardmaw/S8564/ro-staging-area' into baserock/build-essentialbaserock/build-essential
Reviewed-by: Lars Wirzenius
-rw-r--r--gawk.morph13
-rw-r--r--stage2-gawk.morph21
2 files changed, 14 insertions, 20 deletions
diff --git a/gawk.morph b/gawk.morph
index 90dede81..1ad871c6 100644
--- a/gawk.morph
+++ b/gawk.morph
@@ -1,8 +1,5 @@
-{
- "name" : "gawk",
- "kind" : "chunk",
- "build-system" : "autotools",
- "configure-commands": [
- "./configure --prefix=\"$PREFIX\" --disable-nls"
- ]
-}
+name: gawk
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./configure --prefix="$PREFIX" --disable-nls
diff --git a/stage2-gawk.morph b/stage2-gawk.morph
index 64af05ab..f644d72b 100644
--- a/stage2-gawk.morph
+++ b/stage2-gawk.morph
@@ -1,12 +1,9 @@
-{
- "name" : "stage2-gawk",
- "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.guess) --host=$TARGET_STAGE1"
- ],
- "build-commands": [
- "STAGE2_SYSROOT=\"$(dirname $(pwd))\" make"
- ]
-}
+name: stage2-gawk
+kind: chunk
+build-system: autotools
+configure-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" CPPFLAGS="--sysroot=$STAGE2_SYSROOT" CXX=false
+ LDFLAGS="-Wl,--sysroot=$STAGE2_SYSROOT" ./configure --prefix="$PREFIX" --disable-nls
+ --build=$(sh config.guess) --host=$TARGET_STAGE1
+build-commands:
+- STAGE2_SYSROOT="$(dirname $(pwd))" make