Revision: 46564 http://brlcad.svn.sourceforge.net/brlcad/?rev=46564&view=rev Author: jordisayol Date: 2011-09-04 02:01:17 +0000 (Sun, 04 Sep 2011) Log Message: ----------- Correct wrong building dependencies. Force cmake to compile all 3rd party sources in brlcad.
Modified Paths: -------------- brlcad/trunk/misc/debian/control brlcad/trunk/misc/debian/rules brlcad/trunk/sh/make_deb.sh brlcad/trunk/sh/make_rpm.sh Modified: brlcad/trunk/misc/debian/control =================================================================== --- brlcad/trunk/misc/debian/control 2011-09-03 20:56:05 UTC (rev 46563) +++ brlcad/trunk/misc/debian/control 2011-09-04 02:01:17 UTC (rev 46564) @@ -2,7 +2,7 @@ Section: graphics Priority: extra Maintainer: Jordi Sayol <g.sa...@yahoo.es> -Build-Depends: build-essential, fakeroot, debhelper (>= 7.0.0), cmake, bison, flex, libxi-dev, xsltproc, libgl1-mesa-dev, libpango1.0-dev +Build-Depends: build-essential, fakeroot, debhelper (>= 7.0.0), make (>= 3.8.0), cmake, bison, flex, libxi-dev, xsltproc, libgl1-mesa-dev, libpango1.0-dev Standards-Version: 3.9.1 Homepage: http://brlcad.org/ Vcs-Svn: https://brlcad.svn.sourceforge.net/svnroot/brlcad/ Modified: brlcad/trunk/misc/debian/rules =================================================================== --- brlcad/trunk/misc/debian/rules 2011-09-03 20:56:05 UTC (rev 46563) +++ brlcad/trunk/misc/debian/rules 2011-09-04 02:01:17 UTC (rev 46564) @@ -29,7 +29,8 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/brlcad \ -DDATA_DIR=share \ - -DMAN_DIR=share/man + -DMAN_DIR=share/man \ + -DBRLCAD_BUNDLED_LIBS=BUNDLED $(MAKE) $(PARALLEL_OPTIONS) Modified: brlcad/trunk/sh/make_deb.sh =================================================================== --- brlcad/trunk/sh/make_deb.sh 2011-09-03 20:56:05 UTC (rev 46563) +++ brlcad/trunk/sh/make_deb.sh 2011-09-04 02:01:17 UTC (rev 46564) @@ -95,6 +95,7 @@ if test "$1" = "-b" ;then fcheck build-essential + fcheck make fcheck cmake fcheck libtool fcheck bc Modified: brlcad/trunk/sh/make_rpm.sh =================================================================== --- brlcad/trunk/sh/make_rpm.sh 2011-09-03 20:56:05 UTC (rev 46563) +++ brlcad/trunk/sh/make_rpm.sh 2011-09-04 02:01:17 UTC (rev 46564) @@ -81,6 +81,7 @@ fcheck rpm-build fcheck fakeroot fcheck gcc-c++ + fcheck make fcheck cmake fcheck libtool fcheck bc @@ -97,6 +98,7 @@ fcheck rpm fcheck fakeroot fcheck gcc-c++ + fcheck make fcheck cmake fcheck libtool fcheck bc @@ -147,7 +149,8 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/brlcad \ -DDATA_DIR=share \ - -DMAN_DIR=share/man + -DMAN_DIR=share/man \ + -DBRLCAD_BUNDLED_LIBS=BUNDLED make -j$NJOBS fakeroot make install DESTDIR=`pwd`"/$TMPDIR/tmp" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Special Offer -- Download ArcSight Logger for FREE! Finally, a world-class log management solution at an even better price-free! And you'll get a free "Love Thy Logs" t-shirt when you download Logger. Secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsisghtdev2dev _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits