[aadk-commits] qwell: branch upstreamsync r296 - /branches/upstreamsync/scripts/

[aadk-commits at lists.digium.com]

Author: qwell
Date: Fri Mar 30 18:00:47 2007
New Revision: 296

URL: http://svn.digium.com/view/aadk?view=rev&rev=296
Log:
Fix asterisk scripts to use new staging/ dir which contains headers and shared modules for most libraries that were built.

Modified:
    branches/upstreamsync/scripts/build-asterisk
    branches/upstreamsync/scripts/rebuild-asterisk

Modified: branches/upstreamsync/scripts/build-asterisk
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/build-asterisk?view=diff&rev=296&r1=295&r2=296
==============================================================================
--- branches/upstreamsync/scripts/build-asterisk (original)
+++ branches/upstreamsync/scripts/build-asterisk Fri Mar 30 18:00:47 2007
@@ -1,26 +1,18 @@
 #!/bin/sh -e
 cd ../
 . scripts/build-common
-cp -v uClinux/uClinux-dist/lib/ncurses/build/lib/libncurses.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
-cp -v uClinux/uClinux-dist/lib/ncurses/build/include/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/ncurses/include/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/libtonezone/libtonezone.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
-cp -v uClinux/uClinux-dist/lib/zlib/libz.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
-cp -v uClinux/uClinux-dist/lib/zlib/zlib.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/zlib/zconf.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/
-cp -v uClinux/uClinux-dist/lib/libssl/libssl.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
-cp -v uClinux/uClinux-dist/lib/libssl/libcrypto.a $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib/
 mkdir -p $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/openssl/
 cp -v uClinux/uClinux-dist/lib/libssl/include/openssl/*.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/openssl/
 mkdir -p $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
-cp -v uClinux/uClinux-dist/linux-2.6.x/include/zaptel/zaptel.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
-cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/tonezone.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
+cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h $AADKDIR/uClinux/uClinux-dist/staging/usr/include/zaptel/
+#cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/zaptel.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
+#cp -v uClinux/uClinux-dist/linux-2.6.x/drivers/zaptel/tonezone.h $AADKDIR/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/include/zaptel/
 if [ "default" = "$1" ] ; then 
 	echo "Setting the Asterisk build to the default for the AADK."
 	cp -v scripts/menuselect.makeopts.AADK_default asterisk/menuselect.makeopts
 fi
 cd asterisk
-./configure --host=bfin-linux-uclibc --disable-largefile CFLAGS="-g -mfdpic -L$AADK/toolchain/buildscript/out-linux-uclibc/bfin-linux-uclibc/runtime/usr/lib" --without-pwlib --without-curl #--with-zaptel=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-tonezone=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-ncurses=$AADKDIR/uClinux/uClinux-dist/lib/ncurses --with-openssl=$AADKDIR/uClinux/uClinux-dist/lib/libssl #--with-z=$AADKDIR/uClinux/uClinux-dist/lib/zlib
+./configure --host=bfin-linux-uclibc --disable-largefile CFLAGS="-g -mfdpic -I$AADKDIR/uClinux/uClinux-dist/staging/usr/include" LDFLAGS="-L$AADKDIR/uClinux/uClinux-dist/staging/usr/lib" --without-pwlib --without-curl #--with-zaptel=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-tonezone=$AADKDIR/uClinux/uClinux-dist/linux-2.6.x --with-ncurses=$AADKDIR/uClinux/uClinux-dist/lib/ncurses --with-openssl=$AADKDIR/uClinux/uClinux-dist/lib/libssl #--with-z=$AADKDIR/uClinux/uClinux-dist/lib/zlib
 make menuselect
 mkdir -p ../uClinux/uClinux-dist/romfs/var/lib/asterisk/agi-bin
 mkdir -p ../uClinux/uClinux-dist/romfs/var/lib/asterisk/sounds

Modified: branches/upstreamsync/scripts/rebuild-asterisk
URL: http://svn.digium.com/view/aadk/branches/upstreamsync/scripts/rebuild-asterisk?view=diff&rev=296&r1=295&r2=296
==============================================================================
--- branches/upstreamsync/scripts/rebuild-asterisk (original)
+++ branches/upstreamsync/scripts/rebuild-asterisk Fri Mar 30 18:00:47 2007
@@ -2,8 +2,8 @@
 cd ../
 . scripts/build-common
 cd asterisk
-OPTIMIZE="-O4" ASTCFLAGS="-mfdpic" ASTLDFLAGS="-mfdpic" make codecs #GC_CFLAGS="" GC_LDFLAGS=""
-OPTIMIZE="-Os" ASTCFLAGS="-mfdpic" ASTLDFLAGS="-mfdpic" make #GC_CFLAGS="" GC_LDFLAGS=""
+OPTIMIZE="-O4" ASTCFLAGS="-mfdpic -I$AADKDIR/uClinux/uClinux-dist/staging/usr/include" ASTLDFLAGS="-mfdpic -L$AADKDIR/uClinux/uClinux-dist/staging/usr/lib" make codecs #GC_CFLAGS="" GC_LDFLAGS=""
+OPTIMIZE="-Os" ASTCFLAGS="-mfdpic -I$AADKDIR/uClinux/uClinux-dist/staging/usr/include" ASTLDFLAGS="-mfdpic -L$AADKDIR/uClinux/uClinux-dist/staging/usr/lib" make #GC_CFLAGS="" GC_LDFLAGS=""
 cp -v main/asterisk ../uClinux/uClinux-dist/romfs/bin
 ln -sf asterisk ../uClinux/uClinux-dist/romfs/bin/rasterisk
 find . -name '*.so' -exec cp -v "{}" ../uClinux/uClinux-dist/romfs/usr/lib/asterisk/modules/ \;