summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-06-30 13:38:41 (GMT)
committer Jaromil <jaromil@dyne.org>2014-06-30 13:38:49 (GMT)
commit6655f948ffebdece9822c4b6b84764ecb502e9ab (patch)
treee4eafc4fc424f4bffd4603691c964f567d220549
parent19077702cc9a69186e8ad32ec0085426263113da (diff)
static fixes and system updates
-rw-r--r--build/conf.zsh1
-rw-r--r--build/system/Sources6
-rw-r--r--build/system/conf.zsh41
-rwxr-xr-xwrap/static-cc16
4 files changed, 14 insertions, 50 deletions
diff --git a/build/conf.zsh b/build/conf.zsh
index ccf7f44..e7cb6ca 100644
--- a/build/conf.zsh
+++ b/build/conf.zsh
@@ -383,7 +383,6 @@ zinstall() {
act "installing $1 (target ${target})" | tee -a ${LOGS}
- if [
PATH="${PATH}" PREFIX="$PREFIX" \
${=MAKE} -C $1 ${target}
{ test $? = 0 } || {
diff --git a/build/system/Sources b/build/system/Sources
index 21a3690..d10b545 100644
--- a/build/system/Sources
+++ b/build/system/Sources
@@ -3,13 +3,13 @@
zlib -1.2.5 .tar.gz http://www.gnu.org
ncurses -5.9 .tar.gz
slang -2.2.4 .tar.bz2 http://www.jedsoft.org/slang
-zsh -5.0.2 .tar.bz2 http://www.zsh.org
+zsh -5.0.5 .tar.bz2 http://www.zsh.org
# zsh -4.3.15 .tar.bz2 http://www.zsh.org
sed -4.2.1 .tar.bz2 http://www.gnu.org
gawk -4.0.0 .tar.bz2 http://www.gnu.org
grep -2.9 .tar.gz http://www.gnu.org
diffutils -3.2 .tar.gz http://www.gnu.org
-file -5.11 .tar.gz
+file -5.19 .tar.gz
less -451 .tar.gz
most -5.0.0a .tar.bz2 http://www.jedsoft.org/slang
htop -1.0 .tar.gz
@@ -17,7 +17,7 @@ nano -2.2.6 .tar.gz
wipe -2.3.1 .tar.bz2
libevent -2.0.21-stable .tar.gz http://libevent.org/
-tmux -1.8 .tar.gz http://tmux.sourceforge.net/
+tmux -1.9a .tar.gz http://tmux.sourceforge.net/
# netcat -0.7.1 .tar.gz
# opkg -0.1.8 .tar.gz
diff --git a/build/system/conf.zsh b/build/system/conf.zsh
index fe8a3d1..f0ea811 100644
--- a/build/system/conf.zsh
+++ b/build/system/conf.zsh
@@ -34,8 +34,8 @@ ln -sf libncursesw.a libncurses.a
ln -sf libncursesw.a libcurses.a
popd
-compile zsh default
-zinstall zsh
+#compile zsh default
+#zinstall zsh
## s-lang
notice "Building S-Lang"
@@ -113,24 +113,11 @@ compile libevent default
zinstall libevent
## tmux
-#compile tmux default "--enable-static"
-pushd tmux
-zmake
+compile tmux default "--enable-static"
+#pushd tmux
+#zmake
zinstall tmux
-## Opkg
-# compile opkg default "--disable-curl --disable-gpg --disable-shave"
-# zinstall opkg
-
-## manual page browser
-#compile man default
-#zinstall man
-
-## openssl
-# cp $pkg[openssl].Makefile $pkg[openssl]/Makefile
-# compile $pkg[openssl] default
-# zinstall $pkg[openssl]
-
# ## shellinabox
# { test ! -r $pkg[shellinabox].done } && {
# cp $pkg[shellinabox].configure.ac $pkg[shellinabox]/configure.ac
@@ -141,23 +128,6 @@ zinstall tmux
# }
# zinstall $pkg[shellinabox]
-# compile $pkg[dropbear] default # "" noinstal
-# zinstall $pkg[dropbear]
-# # manual install
-# { test -r $pkg[dropbear].done } && {
-# cp $pkg[dropbear]/dropbear $PREFIX/sbin/
-# cp $pkg[dropbear]/dbclient $PREFIX/bin/
-# cp $pkg[dropbear]/dropbearconvert $PREFIX/bin/
-# cp $pkg[dropbear]/dropbearkey $PREFIX/bin/
-# mkdir -p $PREFIX/share/man/man1
-# mkdir -p $PREFIX/share/man/man8
-# cp $pkg[dropbear]/*.1 $PREFIX/share/man/man1;
-# cp $pkg[dropbear]/*.8 $PREFIX/share/man/man8;
-# }
-
-###########################################
-## COPY CONFIGURATIONS AND SCRIPTS
-
# TODO busybox by hand for now
@@ -170,4 +140,3 @@ zinstall tmux
# cd -; touch $pkg[busybox].done
# fi
-# OpenSSL works but not needed for now
diff --git a/wrap/static-cc b/wrap/static-cc
index 927e916..800b500 100755
--- a/wrap/static-cc
+++ b/wrap/static-cc
@@ -31,13 +31,9 @@ typeset -h argc
# QUIET=1 source ${ZHOME}/zmake source
-# save compile settings dir by dir so that we
-# can go there and run make by hand
-if [ "$TOOLCHAIN" = "" ]; then source .zbuild
-else rm -f .zbuild; touch .zbuild
- print TOOLCHAIN=$TOOLCHAIN >> .zbuild
- print ZTARGET=$ZTARGET >> .zbuild
-fi
+TOOLCHAIN=${TOOLCHAIN:=$ZHOME/toolchains/crosstool-ng/x-tools}
+ZTARGET=${ZTARGET:=arm-dyne-linux-gnueabi}
+
case `basename $0`; in
static-cc|cc|gcc) cc=${TOOLCHAIN}/bin/${ZTARGET}-gcc ;;
@@ -173,11 +169,11 @@ echo $arguments | grep -i ' -l' > /dev/null
# typeset -U arguments
# execute
-case $action in
+case "$action" in
compile) print "[CC] $cc ${=cflags} ${=arguments}"
- $cc ${=cflags} ${=arguments} ;;
+ $cc ${cflags} ${arguments} ;;
link) print "[LD] ${TOOLCHAIN}/bin/${ZTARGET}-ld ${=ldflags} ${=arguments}"
- $cc ${=ldflags} ${=arguments} ;;
+ $cc ${ldflags} ${arguments} ;;
esac
return $?