diff --git a/cross-scripts/curl b/cross-scripts/curl index d762cd3..3dfd3e9 100644 --- a/cross-scripts/curl +++ b/cross-scripts/curl @@ -12,7 +12,7 @@ unpack() { build() { pushd src/curl-7.32.0 - CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --with-ssl \ + CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --with-ssl \ --with-random=/dev/urandom --disable-shared || return 1 make -j$nprocs || return 1 popd diff --git a/cross-scripts/libevent b/cross-scripts/libevent index 004c7fb..f132bc6 100644 --- a/cross-scripts/libevent +++ b/cross-scripts/libevent @@ -12,7 +12,7 @@ unpack() { build() { pushd src/libevent-2.0.21-stable - CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1 + CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --disable-shared || return 1 make -j$nprocs || return 1 popd } diff --git a/cross-scripts/libsigc++ b/cross-scripts/libsigc++ index b8370f7..2bfe0e5 100644 --- a/cross-scripts/libsigc++ +++ b/cross-scripts/libsigc++ @@ -12,7 +12,7 @@ unpack() { build() { pushd src/libsigc++-2.3.1 - CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared --enable-static || return 1 + CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --disable-shared --enable-static || return 1 make -j$nprocs || return 1 popd } diff --git a/cross-scripts/libtorrent b/cross-scripts/libtorrent index e827beb..9b7edf6 100644 --- a/cross-scripts/libtorrent +++ b/cross-scripts/libtorrent @@ -12,8 +12,8 @@ unpack() { build() { pushd src/libtorrent-0.13.3 - CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --disable-shared || return 1 - make CC=x86_64-linux-musl-gcc -j$nprocs || return 1 + CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --disable-shared || return 1 + make -j$nprocs || return 1 popd } diff --git a/cross-scripts/ncurses b/cross-scripts/ncurses index 60635b6..2011999 100644 --- a/cross-scripts/ncurses +++ b/cross-scripts/ncurses @@ -13,7 +13,7 @@ unpack() { build() { pushd src/ncurses-5.9 cp $top/stuff/ncurses-fallback.c ncurses/fallback.c - CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --without-tests \ + CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --without-tests \ --with-normal --enable-sigwinch --disable-nls --without-dlsym \ --without-cxx-binding \ --with-fallbacks="linux vt100 xterm xterm256-color" > config.h done diff --git a/pkgs/tmux b/pkgs/tmux index ce08813..b1d81c0 100644 --- a/pkgs/tmux +++ b/pkgs/tmux @@ -13,8 +13,8 @@ unpack() { build() { pushd src/tmux-1.8 CC=x86_64-linux-musl-gcc ./configure --prefix=$root \ - CFLAGS="-I$top/cross/include -I$top/cross/include/ncurses" \ - LDFLAGS="-static -L$top/cross/lib" || return 1 + CFLAGS="-I$libcroot/include -I$libcroot/include/ncurses" \ + LDFLAGS="-static -L$libcroot/lib" || return 1 make -j$nprocs || return 1 popd } diff --git a/prepare-env b/prepare-env index 2d30148..c0cd149 100644 --- a/prepare-env +++ b/prepare-env @@ -1,10 +1,11 @@ top=$(pwd) root=$top/root +libcroot=$top/cross/x86_64-linux-musl nprocs=4 arch=x86_64 version=0.0 mirror=http://dl.2f30.org/morpheus-pkgs/$arch/$version -export top root nprocs mirror +export top root libcroot nprocs mirror -PATH=$top/cross/x86_64-linux-musl/bin:$PATH +PATH=$libcroot/bin:$PATH export PATH diff --git a/stage0 b/stage0 index 6edaeb3..6489ec7 100755 --- a/stage0 +++ b/stage0 @@ -46,7 +46,7 @@ build_pkg_deps() { continue fi deps=$(echo $line | cut -d' ' -f2-) - build_pkg_dep $pkg $deps + build_pkg_dep "$pkg" "$deps" break done < DEPS }