diff --git a/pkgs/dropbear b/pkgs/dropbear index 689e92a..9fec917 100644 --- a/pkgs/dropbear +++ b/pkgs/dropbear @@ -12,8 +12,7 @@ unpack() { build() { pushd src/dropbear-2013.56 - CC=x86_64-linux-musl-gcc ./configure CFLAGS="-I$libcroot/include" \ - LDFLAGS="-static -L$libcroot/lib" --prefix=$root || return 1 + CC=x86_64-linux-musl-gcc ./configure LDFLAGS=-static --prefix=$root || return 1 for i in UTMP WTMP PUTUTLINE PUTUTXLINE SYSLOG LASTLOG; do echo "#define DISABLE_$i" >> config.h done diff --git a/pkgs/tmux b/pkgs/tmux index b1d81c0..ea50fa7 100644 --- a/pkgs/tmux +++ b/pkgs/tmux @@ -12,9 +12,7 @@ unpack() { build() { pushd src/tmux-1.8 - CC=x86_64-linux-musl-gcc ./configure --prefix=$root \ - CFLAGS="-I$libcroot/include -I$libcroot/include/ncurses" \ - LDFLAGS="-static -L$libcroot/lib" || return 1 + CC=x86_64-linux-musl-gcc ./configure --prefix=$root LDFLAGS=-static || return 1 make -j$nprocs || return 1 popd } diff --git a/prepare-env b/prepare-env index c0cd149..58f25dc 100644 --- a/prepare-env +++ b/prepare-env @@ -1,11 +1,11 @@ top=$(pwd) root=$top/root -libcroot=$top/cross/x86_64-linux-musl +libcroot=$top/cross/x86_64-linux-musl/x86_64-linux-musl nprocs=4 arch=x86_64 version=0.0 mirror=http://dl.2f30.org/morpheus-pkgs/$arch/$version export top root libcroot nprocs mirror -PATH=$libcroot/bin:$PATH +PATH=$top/cross/x86_64-linux-musl/bin:$PATH export PATH