← Back to team overview

dorsal team mailing list archive

Re: [Branch ~dorsal-core/dorsal/main] Rev 508: Used generic cmake build to simplify armadillo package and updated to 1.0.0

 

Armadillo does not like to be built out-of-source so this will
probably not work. We could add a variable BUILD_IN_SOURCE=1 in
armadillo.package and then use this variable in dorsal.sh to determine
whether to create and build in dorsal_build_dir or not.

Johannes

On Wed, Dec 22, 2010 at 11:37 AM,  <noreply@xxxxxxxxxxxxx> wrote:
> ------------------------------------------------------------
> revno: 508
> committer: Harish Narayanan <hnarayanan@xxxxxxxxx>
> branch nick: dorsal
> timestamp: Wed 2010-12-22 11:35:25 +0100
> message:
>  Used generic cmake build to simplify armadillo package and updated to 1.0.0
> modified:
>  FEniCS/packages/armadillo.package
>  Templates/packages/template.package
>
>
> --
> lp:dorsal
> https://code.launchpad.net/~dorsal-core/dorsal/main
>
> Your team Dorsal Team is subscribed to branch lp:dorsal.
> To unsubscribe from this branch go to https://code.launchpad.net/~dorsal-core/dorsal/main/+edit-subscription
>
> === modified file 'FEniCS/packages/armadillo.package'
> --- FEniCS/packages/armadillo.package   2010-08-24 12:25:51 +0000
> +++ FEniCS/packages/armadillo.package   2010-12-22 10:35:25 +0000
> @@ -1,13 +1,8 @@
> -NAME=armadillo-0.9.10
> +NAME=armadillo-1.0.0
>  SOURCE=http://downloads.sourceforge.net/arma/
>  PACKING=.tar.gz
> -BUILDCHAIN=custom
> -
> -package_specific_build () {
> -    cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} -DLIB_INSTALL_DIR=lib .
> -    make  -j ${PROCS}
> -    make install
> -}
> +BUILDCHAIN=cmake
> +CONFOPTS=-DLIB_INSTALL_DIR=lib
>
>  package_specific_register () {
>     export ARMADILLO_DIR=${INSTALL_PATH}
>
> === modified file 'Templates/packages/template.package'
> --- Templates/packages/template.package 2010-12-16 15:07:55 +0000
> +++ Templates/packages/template.package 2010-12-22 10:35:25 +0000
> @@ -1,7 +1,7 @@
>  NAME=foo-x.y.z
>  SOURCE=http://foo.org/downloads/foo/
>  PACKING=[.tar.gz|.tar.bz2|.tbz2|.tgz|hg|svn|.git|bzr]
> -BUILDCHAIN=[autotools|python|scons|custom]
> +BUILDCHAIN=[autotools|python|scons|cmake|custom]
>  EXTRACTSTO=barnotfoo
>  CONFOPTS=""
>  SCONSOPTS=""
>
>
>



Follow ups