morpheus

commit acdf184cdf264bae099c3b2582c01e67f19b9e7f
parent 7b16b96176855258c543bc11d24038431cec6728
Author: sin <sin@2f30.org>
Date:   Wed, 25 Sep 2013 14:12:49 +0100

Add $libcroot

Diffstat:
M
cross-scripts/curl
 | 
2
+-
M
cross-scripts/libevent
 | 
2
+-
M
cross-scripts/libsigc++
 | 
2
+-
M
cross-scripts/libtorrent
 | 
4
++--
M
cross-scripts/ncurses
 | 
2
+-
M
cross-scripts/zlib
 | 
2
+-
M
pkgs/dropbear
 | 
4
++--
M
pkgs/tmux
 | 
4
++--
M
prepare-env
 | 
5
+++--
M
stage0
 | 
2
+-

10 files changed, 15 insertions(+), 14 deletions(-)
diff --git 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
@@ -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++
@@ -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
@@ -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
@@ -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" </dev/ptmx || return 1
diff --git a/cross-scripts/zlib b/cross-scripts/zlib
@@ -12,7 +12,7 @@ unpack() {
 
 build() {
 	pushd src/zlib-1.2.8
-	CC=x86_64-linux-musl-gcc ./configure --prefix=$top/cross --static || return 1
+	CC=x86_64-linux-musl-gcc ./configure --prefix=$libcroot --static || return 1
 	make -j$nprocs || return 1
 	popd
 }
diff --git a/pkgs/dropbear b/pkgs/dropbear
@@ -12,8 +12,8 @@ unpack() {
 
 build() {
 	pushd src/dropbear-2013.56
-	CC=x86_64-linux-musl-gcc ./configure CFLAGS="-I$top/cross/include" \
-		LDFLAGS="-static -L$top/cross/lib" --prefix=$root || return 1
+	CC=x86_64-linux-musl-gcc ./configure CFLAGS="-I$libcroot/include" \
+		LDFLAGS="-static -L$libcroot/lib" --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
@@ -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
@@ -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
@@ -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
 }