morpheus

suckless linux distro
git clone git://git.2f30.org/morpheus.git
Log | Files | Refs | Submodules | README | LICENSE

commit 39a1a2ac177ca4fb351e1c9ee49c22d391e539f1
parent 286b38eda5878132276082c569a0cd4f68ffd947
Author: sin <sin@2f30.org>
Date:   Tue Sep 17 11:37:13 +0100

Fix build breakage

Diffstat:
cross-scripts/ncurses-5.9 | 5+++--
pkgs/em | 15+++++++++++----
stage0 | 8+++++---
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/cross-scripts/ncurses-5.9 b/cross-scripts/ncurses-5.9 @@ -13,8 +13,9 @@ unpack() { build() { pushd src/ncurses-5.9 wget -c $mirror/ncurses-fallback.c -O ncurses/fallback.c - CC=musl-gcc ./configure --without-tests --prefix=$top/cross \ - --with-fallbacks="vt100" + CC=musl-gcc ./configure --prefix=$top/cross --without-tests \ + --with-normal --enable-sigwinch --disable-nls --without-dlsym \ + --without-cxx-binding --with-fallbacks="vt100" make CC=musl-gcc -j$nprocs popd } diff --git a/pkgs/em b/pkgs/em @@ -1,20 +1,27 @@ -url=git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git +url=$mirror/em.tar.gz fetch() { - git clone $url src/em + wget -c $url -O src/em.tar.gz +} + +unpack() { + pushd src + [ -d em ] || tar xzf em.tar.gz + popd } build() { - mkdir -p $root/share/doc/uemacs pushd src/em make clean sed -i "s@BINDIR=/usr/bin@BINDIR=${root}/bin@;s@LIBDIR=/usr/lib@LIBDIR=${root}/share/doc/uemacs@" Makefile - make -j$nprocs LDFLAGS="-static" + make -j$nprocs CC="musl-gcc -I$top/cross/include -I$top/cross/include/ncurses" \ + LDFLAGS="-static -L$top/cross/lib" popd } install() { pushd src/em + mkdir -p $root/share/doc/uemacs make install popd } diff --git a/stage0 b/stage0 @@ -11,13 +11,15 @@ export top root nprocs mirror . ./prepare-root ./build cross-scripts/musl-0.9.13 -./build cross-scripts/libevent-2.0.21 -./build cross-scripts/ncurses-5.9 -./build cross-scripts/zlib-1.2.8 PATH=$top/cross/bin:$PATH export PATH +# These are ordered +./build cross-scripts/libevent-2.0.21 +./build cross-scripts/ncurses-5.9 +./build cross-scripts/zlib-1.2.8 + # Build stage0 packages pkglist=$(ls pkgs) for pkg in $pkglist; do