diff options
| -rwxr-xr-x | acprep | 18 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 8 | ||||
| -rwxr-xr-x | tools/proof | 3 |
4 files changed, 12 insertions, 19 deletions
@@ -816,24 +816,16 @@ class PrepareBuild(CommandLineApp): self.log.info('Looks like you are using MacPorts on OS X') packages = [ 'sudo', 'port', 'install', '-f', - 'automake', - 'autoconf', - 'libtool', + 'automake', 'autoconf', 'libtool', 'python26', '+universal', 'libiconv', '+universal', 'zlib', '+universal', - 'gmp' ,'+universal', - 'mpfr', '+universal', - 'ncurses', '+universal', - 'ncursesw', '+universal', + 'gmp' ,'+universal', 'mpfr', '+universal', + 'ncurses', '+universal', 'ncursesw', '+universal', 'gettext' ,'+universal', 'libedit' ,'+universal', - #'texlive', - #'doxygen', - #'graphviz', - 'texinfo', - 'lcov', - 'sloccount' + 'texlive-xetex', 'doxygen', 'graphviz', 'texinfo', + 'lcov', 'sloccount' ] + self.boost_info.dependencies('darwin') self.log.info('Executing: ' + string.join(packages, ' ')) self.execute(*packages) diff --git a/lib/Makefile b/lib/Makefile index fa81bb76..06d4da93 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -33,7 +33,7 @@ ifeq ($(CC),clang) BOOST_TOOLSET = clang else BOOST_TOOLSET = darwin -BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 +BOOST_DEFINES += define=_GLIBCXX_DEBUG=1 endif #BOOST_FLAGS = --architecture=x86 --address_model=32_64 BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index f95f832e..4605c4a2 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -413,10 +413,10 @@ unittests: check 2>&1 | grep -v '^GuardMalloc:' @sh $(FULLCHECK) $(top_builddir)/ExprTests$(EXEEXT) --verify \ 2>&1 | grep -v '^GuardMalloc:' - @sh $(FULLCHECK) $(top_builddir)/DataTests$(EXEEXT) --verify \ - 2>&1 | grep -v '^GuardMalloc:' - @sh $(FULLCHECK) $(top_builddir)/ReportTests$(EXEEXT) --verify \ - 2>&1 | grep -v '^GuardMalloc:' +# @sh $(FULLCHECK) $(top_builddir)/DataTests$(EXEEXT) --verify \ +# 2>&1 | grep -v '^GuardMalloc:' +# @sh $(FULLCHECK) $(top_builddir)/ReportTests$(EXEEXT) --verify \ +# 2>&1 | grep -v '^GuardMalloc:' else unittests: check @test 1 -eq 1 diff --git a/tools/proof b/tools/proof index 0bd1e81f..3becb1c9 100755 --- a/tools/proof +++ b/tools/proof @@ -14,7 +14,8 @@ fi rm -fr ~/Products/ledger-proof -time ./acprep --enable-doxygen --universal -j16 --gcc46 --warn proof 2>&1 | \ +time nice -n 20 \ + ./acprep --enable-doxygen --universal -j16 --gcc45 --warn proof 2>&1 | \ tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then |