diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 16:23:32 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-15 16:23:32 +0000 |
| commit | 831d02022a7dd74e256e2c46e60cb7160ae10270 (patch) | |
| tree | f50e5fa28e08ef919c5276df59a8e5615acd2d0c | |
| parent | 118153b689b29ef931d5ea1dd84e9c43cd0800e3 (diff) | |
| parent | 221b6e72ee00b14d9166f81ca5d2cf488fbc4732 (diff) | |
| download | zlib-831d02022a7dd74e256e2c46e60cb7160ae10270.tar.gz | |
Merge branch 'baserock/samthursfield/build-essential-2-rebase' into baserock/build-essential
| -rw-r--r-- | stage2-zlib.morph | 15 | ||||
| -rw-r--r-- | stage2-zlib.morph.yaml | 23 | ||||
| -rw-r--r-- | zlib.morph | 6 | ||||
| -rw-r--r-- | zlib.morph.yaml | 12 |
4 files changed, 53 insertions, 3 deletions
diff --git a/stage2-zlib.morph b/stage2-zlib.morph new file mode 100644 index 0000000..8228d8c --- /dev/null +++ b/stage2-zlib.morph @@ -0,0 +1,15 @@ +{ + "name": "stage2-zlib", + "kind": "chunk", + "max-jobs": "1", + "configure-commands": [ + "stage2-eglibc-fix-specs", + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nexport CFLAGS=\"--sysroot=$STAGE2_SYSROOT\"\nexport CHOST=$TARGET_STAGE1\nexport CXX=false\nexport LDSHARED=\"$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT\"\n./configure --prefix=\"$PREFIX\"\n" + ], + "build-commands": [ + "export STAGE2_SYSROOT=\"$(dirname $(pwd))\"\nmake\n" + ], + "install-commands": [ + "make DESTDIR=\"$DESTDIR\" install" + ] +} diff --git a/stage2-zlib.morph.yaml b/stage2-zlib.morph.yaml new file mode 100644 index 0000000..6ac073a --- /dev/null +++ b/stage2-zlib.morph.yaml @@ -0,0 +1,23 @@ +name: stage2-zlib +kind: chunk +max-jobs: '1' + +configure-commands: + - stage2-eglibc-fix-specs + + # ZLib's configure is not a standard autoconf configure script + - | + export STAGE2_SYSROOT="$(dirname $(pwd))" + export CFLAGS="--sysroot=$STAGE2_SYSROOT" + export CHOST=$TARGET_STAGE1 + export CXX=false + export LDSHARED="$TARGET_STAGE1-gcc -Wl,--sysroot=$STAGE2_SYSROOT" + ./configure --prefix="$PREFIX" + +build-commands: + - | + export STAGE2_SYSROOT="$(dirname $(pwd))" + make + +install-commands: + - make DESTDIR="$DESTDIR" install @@ -3,12 +3,12 @@ "kind": "chunk", "max-jobs": "1", "configure-commands": [ - "LD_LIBRARY_PATH=\"/tools/lib:$LD_LIBRARY_PATH\" PATH=\"/tools/bin:$PATH\" prefix=\"${PREFIX-/usr}\" CC='gcc -B/usr/lib -B/usr/lib64' ./configure" + "./configure --prefix=\"$PREFIX\"" ], "build-commands": [ - "LD_LIBRARY_PATH=\"/tools/lib:$LD_LIBRARY_PATH\" PATH=\"/tools/bin:$PATH\" make" + "make" ], "install-commands": [ - "LD_LIBRARY_PATH=\"/tools/lib:$LD_LIBRARY_PATH\" PATH=\"/tools/bin:$PATH\" make DESTDIR=\"$DESTDIR\" install" + "make DESTDIR=\"$DESTDIR\" install" ] } diff --git a/zlib.morph.yaml b/zlib.morph.yaml new file mode 100644 index 0000000..93c5a21 --- /dev/null +++ b/zlib.morph.yaml @@ -0,0 +1,12 @@ +name: zlib +kind: chunk +max-jobs: '1' + +configure-commands: + - ./configure --prefix="$PREFIX" + +build-commands: + - make + +install-commands: + - make DESTDIR="$DESTDIR" install |