summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2014-06-30 09:17:17 (GMT)
committer Jaromil <jaromil@dyne.org>2014-06-30 09:20:50 (GMT)
commit5b3472b41b21ff02226f637c25aaecf2f6c1c89d (patch)
tree9a81aa2eeddd22898f0c84c46792f3355734f285
parent499358940347d84c7adc809db348737af87a71d4 (diff)
minor build fixes
-rw-r--r--build/lang/conf.zsh8
-rw-r--r--build/media/conf.zsh13
-rw-r--r--build/toys/conf.zsh2
3 files changed, 11 insertions, 12 deletions
diff --git a/build/lang/conf.zsh b/build/lang/conf.zsh
index 8fa2f5c..6d29159 100644
--- a/build/lang/conf.zsh
+++ b/build/lang/conf.zsh
@@ -2,10 +2,6 @@
# (C) 2012 Denis Roio - GNU GPL v3
# refer to zmake for license details
-# configure the logfile
-LOGS=build.log
-rm -f $LOGS; touch $LOGS
-
###########################################
## COMPILE PACKAGES:
@@ -17,9 +13,11 @@ prepare_sources
pushd lua/src
for s in `find . -name '*.c'`; do
{ test -r ${s%.*}.o } || {
+ print "[CC] ${ZTARGET}-gcc ${=CFLAGS} -DLUA_USE_POSIX -DLUA_COMPAT_ALL -c ${s}"
${ZTARGET}-gcc ${=CFLAGS} -DLUA_USE_POSIX -DLUA_COMPAT_ALL -c ${s} }; done
luas=`find . -name '*.o' | grep -v luac.o`
- ${ZTARGET}-gcc -o lua ${=CFLAGS} ${=luas} ${=LDFLAGS} -lncursesw -lm
+ print "[LD] ${ZTARGET}-ld -o lua ${=luas} ${=LDFLAGS} -lncursesw -lm"
+ ${ZTARGET}-ld -o lua ${=luas} ${=LDFLAGS} -lm -lc -lstdc++ -ldl
{ test $? = 0 } && {
touch ../../lua.done
notice "lua compiled"
diff --git a/build/media/conf.zsh b/build/media/conf.zsh
index 820fe90..9535f09 100644
--- a/build/media/conf.zsh
+++ b/build/media/conf.zsh
@@ -3,8 +3,8 @@
# refer to zmake for license details
# configure the compile flags
-OPTIMIZATIONS="-O3"
-ARCH="-mfloat-abi=softfp -march=armv7-a -mtune=cortex-a8"
+#OPTIMIZATIONS="-O3"
+#ARCH="-mfloat-abi=softfp -march=armv7-a -mtune=cortex-a8"
###########################################
## COMPILE PACKAGES:
@@ -99,7 +99,7 @@ zinstall sox
notice "Building xvidcore"
{ test -r xvidcore.done } || {
pushd xvidcore/build/generic
- zconfigure default
+ zconfigure default "--disable-shared --enable-static"
zmake
{ test $? = 0 } && { touch ../../../xvidcore.done }
popd
@@ -112,10 +112,10 @@ notice "Building xvidcore"
}
act "done."
-compile x264 default "--enable-static --cross-prefix=${TARGET}-"
+compile x264 default "--disable-shared --enable-static --cross-prefix=${ZTARGET}-"
zinstall x264
-compile ffmpeg "--prefix=$PREFIX --disable-shared --enable-static --enable-gpl --enable-version3 --extra-libs=-static --extra-cflags=-static-libgcc" "--enable-zlib --enable-cross-compile --cross-prefix=${TARGET}- --target-os=linux --cc=$TARGET-gcc --host-cc=$TARGET-gcc --arch=armv5 --disable-asm --disable-debug --enable-libvorbis --enable-libx264 --enable-libspeex"
+compile ffmpeg "--prefix=$PREFIX --disable-shared --enable-static --enable-gpl --enable-version3 --extra-libs=-static --extra-cflags=-static-libgcc" "--enable-zlib --enable-cross-compile --cross-prefix=${ZTARGET}- --target-os=linux --cc=${ZTARGET}-gcc --host-cc=${ZTARGET}-gcc --arch=armv5 --disable-asm --disable-debug --enable-libvorbis --enable-libx264 --enable-libspeex"
pushd ffmpeg
make doc/ffmpeg.1
make doc/ffprobe.1
@@ -123,10 +123,11 @@ popd
zinstall ffmpeg
+
# TODO: theora broken
# if ! [ -r $pkg[theora].done ]; then
-# cd $pkg[theora]; CFLAGS=$CFLAGS ./configure --host=$TARGET --prefix=$PREFIX \
+# cd $pkg[theora]; CFLAGS=$CFLAGS ./configure --host=${ZTARGET} --prefix=$PREFIX \
# --disable-shared --enable-static --with-pic=no \
# --disable-spec --disable-examples --disable-sdltest
# make
diff --git a/build/toys/conf.zsh b/build/toys/conf.zsh
index c2f88c5..8ff6f78 100644
--- a/build/toys/conf.zsh
+++ b/build/toys/conf.zsh
@@ -19,7 +19,7 @@ zinstall libcaca
notice "Building steam locomotive"
{ test -r sl.done } || {
pushd sl
- ${TARGET}-gcc ${=CFLAGS} -o sl sl.c ${=LDFLAGS} -lncursesw
+ ${ZTARGET}-gcc ${=CFLAGS} -o sl sl.c ${=LDFLAGS} -I$PREFIX/include -lncursesw
{ test $? = 0 } && { touch ../sl.done }
popd }
{ test -r sl.installed } || {