From be7af24250260c52668ffa27b93c8a45f68b58d5 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@fpcomplete.com>
Date: Wed, 30 Jan 2013 16:59:42 -0600
Subject: Upgrade to Boost 1.52

---
 acprep       | 2 +-
 lib/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/acprep b/acprep
index 26f8d8b2..b83d1f19 100755
--- a/acprep
+++ b/acprep
@@ -99,7 +99,7 @@ class CommandLineApp(object):
 
     force_exit    = True           # If true, always ends run() with sys.exit()
     log_handler   = None
-    boost_major   = "1_50"
+    boost_major   = "1_52"
 
     options = {
         'debug':    False,
diff --git a/lib/Makefile b/lib/Makefile
index 68755f18..ddbe0585 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ STOW_ROOT	= /usr/local/Cellar/boost
 PRODUCTS	= $(HOME)/Products
 
 GCC_VERSION	= 4.7
-BOOST_VERSION	= 1_50_0
+BOOST_VERSION	= 1_52_0
 
 CC		= gcc-mp-$(GCC_VERSION)
 ifeq ($(CC),clang)
-- 
cgit v1.2.3


From 7e0666b013eeb99c142b453107d1df530ba68c6c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@fpcomplete.com>
Date: Wed, 30 Jan 2013 16:59:55 -0600
Subject: build.sh now installs into Homebrew's Cellar

---
 tools/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/build.sh b/tools/build.sh
index e79689e3..ba563e34 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -5,6 +5,7 @@ shift 1
 
 JOBS=-j$(sysctl -n hw.activecpu)
 OPTIONS="$flavor --debug --python --ninja --doxygen $JOBS"
+OPTIONS="$OPTIONS --prefix /usr/local/Cellar/ledger/HEAD"
 
 time (                                                  \
     cd ~/src/ledger ;                                   \
-- 
cgit v1.2.3


From 2b245f823b0cab9aad74a5c0b59dc6de66dee21a Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@fpcomplete.com>
Date: Wed, 30 Jan 2013 17:00:07 -0600
Subject: Added missing call to timelog.close()

---
 src/textual.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/textual.cc b/src/textual.cc
index 6106914f..b19ce79a 100644
--- a/src/textual.cc
+++ b/src/textual.cc
@@ -282,6 +282,10 @@ void instance_t::parse()
     }
   }
 
+#if defined(TIMELOG_SUPPORT)
+  timelog.close();
+#endif // TIMELOG_SUPPORT
+
   TRACE_STOP(instance_parse, 1);
 }
 
-- 
cgit v1.2.3


From ccca974dadc9c57805aeb47565eecd4e25c9d368 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@fpcomplete.com>
Date: Wed, 30 Jan 2013 17:00:22 -0600
Subject: Use -O3 with Clang instead of -O4

---
 acprep | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/acprep b/acprep
index b83d1f19..36481f4a 100755
--- a/acprep
+++ b/acprep
@@ -666,8 +666,10 @@ class PrepareBuild(CommandLineApp):
             self.configure_args.append('-DCMAKE_CXX_COMPILER:PATH=/usr/local/bin/clang++')
 
             if self.current_flavor == 'opt':
-                self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O4')
-                self.configure_args.append('-DCMAKE_CXX_LINK_FLAGS_RELEASE:STRING=-O4')
+                self.configure_args.append('-DCMAKE_CXX_FLAGS_RELEASE:STRING=-O3')
+                self.configure_args.append('-DCMAKE_EXE_LINKER_FLAGS:STRING=-O3')
+                self.configure_args.append('-DCMAKE_SHARED_LINKER_FLAGS:STRING=-O3')
+                self.configure_args.append('-DCMAKE_MODULE_LINKER_FLAGS:STRING=-O3')
             #else:
             #    self.CXXFLAGS.append('-g -O1 -faddress-sanitizer')
             #    self.LDFLAGS.append('-g -O1 -faddress-sanitizer')
-- 
cgit v1.2.3