diff options
Diffstat (limited to 'strata/tools')
| -rw-r--r-- | strata/tools/distcc.morph | 6 | ||||
| -rw-r--r-- | strata/tools/e2fsprogs.morph | 21 | ||||
| -rw-r--r-- | strata/tools/gdb.morph | 2 | ||||
| -rw-r--r-- | strata/tools/vala-bootstrap.morph | 2 |
4 files changed, 8 insertions, 23 deletions
diff --git a/strata/tools/distcc.morph b/strata/tools/distcc.morph index 9f42b50e..82adbe50 100644 --- a/strata/tools/distcc.morph +++ b/strata/tools/distcc.morph @@ -1,6 +1,10 @@ name: distcc kind: chunk build-system: autotools -configure-commands: +pre-configure-commands: - NOCONFIGURE=1 ./autogen.sh +# distcc doesn't use automake, so we cannot autoreconf it +- cp /usr/share/automake*/config.guess . +- cp /usr/share/automake*/config.sub . +configure-commands: - ./configure --prefix="$PREFIX" --disable-Werror diff --git a/strata/tools/e2fsprogs.morph b/strata/tools/e2fsprogs.morph deleted file mode 100644 index 801f8abe..00000000 --- a/strata/tools/e2fsprogs.morph +++ /dev/null @@ -1,21 +0,0 @@ -name: e2fsprogs -kind: chunk -build-system: autotools -configure-commands: -# Configure with the usual paths for binaries and config -# but also disable whatever we can that is already provided by util-linux -# Disabling e2fsprofs' libblkid does not work, but we don't have to -# install it. -- | - ./configure --prefix="$PREFIX" --sysconfdir=/etc \ - --disable-libuuid --disable-uuidd --disable-fsck -install-commands: -# e2fsprogs also includes tools that are provided by util-linux, so we -# need to selectively exclude them. Removing them directly from DESTDIR -# causes problems, so we need to remove them beforehand. -- | - td="$(mktemp -d)" - make DESTDIR="$td" install - find "$td" \( -name blkid -o -name findfs -o -name fsck \) -delete - find "$td" \( -name blkid.8 -o -name findfs.8 \) -delete - mv "$td"/* "$DESTDIR" diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph index 8b82b9d9..808ff7d7 100644 --- a/strata/tools/gdb.morph +++ b/strata/tools/gdb.morph @@ -2,4 +2,4 @@ name: gdb kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-werror +- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof diff --git a/strata/tools/vala-bootstrap.morph b/strata/tools/vala-bootstrap.morph index c09299f6..e55b1887 100644 --- a/strata/tools/vala-bootstrap.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,5 +1,7 @@ name: vala-bootstrap kind: chunk build-system: autotools +pre-configure-commands: +- autoreconf -ivf configure-commands: - ./configure --prefix="$PREFIX" |