summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-10-19 22:58:22 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-10-20 09:43:40 +0000
commit6b9b5c87c14bf8eb8fc66731c4773218f45dec03 (patch)
treea7b8c8419be9499308758b2f9848112c1cb5cfd4
parentc6121385c968741cb7057a24003f2aca5b5bf77a (diff)
downloaddefinitions-6b9b5c87c14bf8eb8fc66731c4773218f45dec03.tar.gz
Add stage2-bash before glibc
-rw-r--r--strata/build-essential.morph12
-rw-r--r--strata/build-essential/glibc.morph6
-rw-r--r--strata/build-essential/stage2-bash.morph8
3 files changed, 23 insertions, 3 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index b10f3018..d9a99eb6 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -149,6 +149,17 @@ chunks:
- stage2-glibc
build-mode: bootstrap
prefix: /tools
+- name: stage2-bash
+ morph: strata/build-essential/stage2-bash.morph
+ repo: upstream:bash
+ ref: 3590145af6f1c9fa321dff231f69ae696e7e740b
+ unpetrify-ref: baserock/bash-4.3-patch-27
+ build-depends:
+ - stage1-binutils
+ - stage1-gcc
+ - stage2-glibc
+ build-mode: bootstrap
+ prefix: /tools
- name: stage2-reset-specs
morph: strata/build-essential/stage2-reset-specs.morph
repo: upstream:eglibc2
@@ -196,6 +207,7 @@ chunks:
repo: upstream:glibc
ref: baserock/pedroalvarez/build-essential
build-depends:
+ - stage2-bash
- stage2-binutils
- stage2-busybox
- stage2-glibc
diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph
index 5372152a..39cdf4ca 100644
--- a/strata/build-essential/glibc.morph
+++ b/strata/build-essential/glibc.morph
@@ -38,13 +38,13 @@ products:
- .*
configure-commands:
- mkdir o
-
## Necessary for ARM port
#- cd libc && ln -s ../ports ports
- |
- export CFLAGS="-O2 $CFLAGS"; cd o &&
- ../configure \
+ export PATH="/usr/bin:/usr/lib/ccache:/sbin:/usr/sbin:/bin:/usr/bin";
+ export CFLAGS="-O2 $CFLAGS";
+ cd o && ../configure \
--prefix="$PREFIX" \
--disable-profile \
--enable-kernel=2.6.25 \
diff --git a/strata/build-essential/stage2-bash.morph b/strata/build-essential/stage2-bash.morph
new file mode 100644
index 00000000..70fbdab0
--- /dev/null
+++ b/strata/build-essential/stage2-bash.morph
@@ -0,0 +1,8 @@
+name: stage2-bash
+kind: chunk
+configure-commands:
+- ./configure --prefix="$PREFIX" --bindir="$PREFIX"/bin --without-bash-malloc
+build-commands:
+- make
+install-commands:
+- make DESTDIR="$DESTDIR" install