Skip to content

Commit

Permalink
fixes for netbsd. clarify readme.
Browse files Browse the repository at this point in the history
  • Loading branch information
donbright committed Dec 20, 2012
1 parent 799bb20 commit 238cf85
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 17 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ can download and build dependencies into $HOME/openscad_deps as follows:
source ./scripts/setenv-unibuild.sh
./scripts/uni-build-dependencies.sh

This may take several hours. After completion, again check dependencies
This may take an hour or two. Note it will not build huge deps like gcc
or qt, only the main ones (boost, CGAL, opencsg, etc). After completion,
again check dependencies

source ./scripts/setenv-unibuild.sh
./scripts/check-dependencies.sh
Expand Down
24 changes: 21 additions & 3 deletions scripts/check-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ qt4_sysver()
if [ ! -e $qt4path ]; then
qt4path=$1/include/QtCore/qglobal.h
fi
if [ ! -e $qt4path ]; then
# netbsd
qt4path=$1/qt4/include/QtCore/qglobal.h
fi
if [ ! -e $qt4path ]; then return; fi
qt4ver=`grep 'define *QT_VERSION_STR *' $qt4path | awk '{print $3}'`
qt4ver=`echo $qt4ver | sed s/'"'//g`
Expand Down Expand Up @@ -169,11 +173,21 @@ cmake_sysver()

make_sysver()
{
make_sysver_tmp=
binmake=$1/bin/make
if [ -x $1/bin/gmake ]; then binmake=$1/bin/gmake ;fi
if [ ! -x $binmake ]; then return ;fi
make_sysver_result=`$binmake --version 2>&1 | grep -i 'gnu make' | sed s/"[^0-9.]"/" "/g`
if [ ! "`echo $make_sysver_result | grep [0-9]`" ]; then return; fi
make_sysver_tmp=`$binmake --version 2>&1`

debug finding gnu make: raw make response: $make_sysver_tmp
if [ ! "`echo $make_sysver_tmp | grep -i gnu`" ]; then
return;
fi

make_sysver_tmp=`$binmake --version 2>&1 | grep -i 'gnu make' | sed s/"[^0-9.]"/" "/g`
if [ "`echo $make_sysver_tmp | grep [0-9]`" ]; then
make_sysver_result=$make_sysver_tmp
fi
}

bash_sysver()
Expand Down Expand Up @@ -402,10 +416,13 @@ find_min_version()
fmvdep=$1
get_minversion_from_readme $fmvdep
fmvtmp=$get_minversion_from_readme_result

# items not included in README.md
if [ $fmvdep = "git" ]; then fmvtmp=1.5 ; fi
if [ $fmvdep = "curl" ]; then fmvtmp=6 ; fi
if [ $fmvdep = "make" ]; then fmvtmp=3 ; fi
if [ $fmvdep = "python" ]; then fmvtmp=2 ; fi

find_min_version_result=$fmvtmp
}

Expand Down Expand Up @@ -574,7 +591,8 @@ checkargs()
main()
{
deps="qt4 cgal gmp cmake mpfr boost opencsg glew eigen gcc"
deps="$deps python bison flex git curl make"
deps="$deps bison flex git curl make"
#deps="$deps python" # needs work, only needed for tests
#deps="$deps imagemagick" # needs work, only needed for tests
#deps="eigen glew opencsg" # debug
pretty_print title
Expand Down
19 changes: 19 additions & 0 deletions scripts/setenv-unibuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ setenv_common()
fi
DEPLOYDIR=$BASEDIR

export BASEDIR
export PATH=$BASEDIR/bin:$PATH
export LD_LIBRARY_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64
export LD_RUN_PATH=$DEPLOYDIR/lib:$DEPLOYDIR/lib64
Expand Down Expand Up @@ -51,6 +52,20 @@ setenv_freebsd()
QTDIR=/usr/local/share/qt4
}

setenv_netbsd()
{
setenv_common
QMAKESPEC=netbsd-g++
QTDIR=/usr/pkg/qt4
PATH=/usr/pkg/qt4/bin:$PATH
LD_LIBRARY_PATH=/usr/pkg/qt4/lib:$LD_LIBRARY_PATH

export QMAKESPEC
export QTDIR
export PATH
export LD_LIBRARY_PATH
}

setenv_linux_clang()
{
export CC=clang
Expand All @@ -69,4 +84,8 @@ if [ "`uname | grep -i 'linux\|debian'`" ]; then
fi
elif [ "`uname | grep -i freebsd`" ]; then
setenv_freebsd
elif [ "`uname | grep -i netbsd`" ]; then
setenv_netbsd
else
echo unknown system. edit $0
fi
26 changes: 13 additions & 13 deletions scripts/uni-build-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ build_git()
cd $BASEDIR/src
rm -rf git-$version
if [ ! -f git-$version.tar.gz ]; then
curl -O http://git-core.googlecode.com/files/git-$version.tar.gz
curl --insecure -O http://git-core.googlecode.com/files/git-$version.tar.gz
fi
tar zxf git-$version.tar.gz
cd git-$version
Expand All @@ -44,7 +44,7 @@ build_cmake()
cd $BASEDIR/src
rm -rf cmake-$version
if [ ! -f cmake-$version.tar.gz ]; then
curl -O http://www.cmake.org/files/v2.8/cmake-$version.tar.gz
curl --insecure -O http://www.cmake.org/files/v2.8/cmake-$version.tar.gz
fi
tar zxf cmake-$version.tar.gz
cd cmake-$version
Expand Down Expand Up @@ -80,7 +80,7 @@ build_gmp()
cd $BASEDIR/src
rm -rf gmp-$version
if [ ! -f gmp-$version.tar.bz2 ]; then
curl -O ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2
curl --insecure -O ftp://ftp.gmplib.org/pub/gmp-$version/gmp-$version.tar.bz2
fi
tar xjf gmp-$version.tar.bz2
cd gmp-$version
Expand All @@ -97,7 +97,7 @@ build_mpfr()
cd $BASEDIR/src
rm -rf mpfr-$version
if [ ! -f mpfr-$version.tar.bz2 ]; then
curl -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2
curl --insecure -O http://www.mpfr.org/mpfr-$version/mpfr-$version.tar.bz2
fi
tar xjf mpfr-$version.tar.bz2
cd mpfr-$version
Expand All @@ -116,7 +116,7 @@ build_boost()
cd $BASEDIR/src
rm -rf boost_$bversion
if [ ! -f boost_$bversion.tar.bz2 ]; then
curl -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
curl --insecure -LO http://downloads.sourceforge.net/project/boost/boost/$version/boost_$bversion.tar.bz2
fi
tar xjf boost_$bversion.tar.bz2
cd boost_$bversion
Expand Down Expand Up @@ -147,11 +147,11 @@ build_cgal()
rm -rf CGAL-$version
if [ ! -f CGAL-$version.tar.gz ]; then
#4.0.2
curl -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2
# 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
# 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
# 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
# 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
curl --insecure -O https://gforge.inria.fr/frs/download.php/31174/CGAL-$version.tar.bz2
# 4.0 curl --insecure -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
# 3.9 curl --insecure -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
# 3.8 curl --insecure -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
# 3.7 curl --insecure -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
fi
tar jxf CGAL-$version.tar.bz2
cd CGAL-$version
Expand All @@ -171,7 +171,7 @@ build_glew()
cd $BASEDIR/src
rm -rf glew-$version
if [ ! -f glew-$version.tgz ]; then
curl -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
curl --insecure -LO http://downloads.sourceforge.net/project/glew/glew/$version/glew-$version.tgz
fi
tar xzf glew-$version.tgz
cd glew-$version
Expand Down Expand Up @@ -213,7 +213,7 @@ build_opencsg()
cd $BASEDIR/src
rm -rf OpenCSG-$version
if [ ! -f OpenCSG-$version.tar.gz ]; then
curl -O http://www.opencsg.org/OpenCSG-$version.tar.gz
curl --insecure -O http://www.opencsg.org/OpenCSG-$version.tar.gz
fi
tar xzf OpenCSG-$version.tar.gz
cd OpenCSG-$version
Expand Down Expand Up @@ -265,7 +265,7 @@ build_eigen()
fi
rm -rf ./$EIGENDIR
if [ ! -f eigen-$version.tar.bz2 ]; then
curl -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2
curl --insecure -LO http://bitbucket.org/eigen/eigen/get/$version.tar.bz2
mv $version.tar.bz2 eigen-$version.tar.bz2
fi
tar xjf eigen-$version.tar.bz2
Expand Down

0 comments on commit 238cf85

Please sign in to comment.