aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL32
-rw-r--r--INSTALL.cli40
2 files changed, 64 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL
index 93bb1d5..f966fe1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,6 +18,16 @@ issues, then you can adjust the commands below accordingly. Note that even if
/usr/local/lib is searched at runtime, you may still have to run ldconfig(1)
(as root) after the installation to refresh the library cache.
+Note for Mac OS users: you will need version 10.5 (Leopard) or later. We will
+also be using the system C++ toolchain that comes with the Xcode Command Line
+Tools. To verify it is installed, run:
+
+$ g++ --version
+
+To install Command Line Tools, run:
+
+$ xcode-select --install
+
1. Installing SQLite
Skip this step if you are only interested in the build2 build system.
@@ -38,6 +48,20 @@ issues, then you can adjust the commands below accordingly. Note that even if
# pkg install sqlite3
+ For Mac OS:
+
+ You should already have a system-default version installed. To verify:
+
+ $ ls /usr/include/sqlite3.h /usr/lib/libsqlite3.dylib
+
+ To see which version you have, run:
+
+ $ grep '#define SQLITE_VERSION' /usr/include/sqlite3.h
+
+ Any recent version (i.e., greater than 3.5.0) should work. If for some
+ reason you don't seem to have SQLite, download the source code then build
+ and install it into /usr/local.
+
2. Installing libodb and libodb-sqlite
Again, skip this step if you are only interested in the build2 build
@@ -69,7 +93,7 @@ issues, then you can adjust the commands below accordingly. Note that even if
$ cd build2-toolchain-X.Y.Z
$ cd build2/
$ ./bootstrap
- $ ./build/b-boot config.bin.rpath=/usr/local/lib update
+ $ ./build2/b-boot config.bin.rpath=/usr/local/lib update
For more information on this step (for example, how to specify the C++
compiler, options, etc.), refer to the INSTALL file in the build2/
@@ -79,7 +103,7 @@ issues, then you can adjust the commands below accordingly. Note that even if
$ cd .. # back to build2-toolchain-X.Y.Z
- $ ./build2/build/b \
+ $ ./build2/build2/b \
config.cxx.poptions=-I/usr/local/include \
config.cxx.loptions=-L/usr/local/lib \
config.bin.rpath=/usr/local/lib \
@@ -87,8 +111,8 @@ issues, then you can adjust the commands below accordingly. Note that even if
config.install.root.sudo=sudo \
configure
- $ ./build2/build/b update
- $ ./build2/build/b install
+ $ ./build2/build2/b update
+ $ ./build2/build2/b install
To test the installation, run:
diff --git a/INSTALL.cli b/INSTALL.cli
index b419926..9f72067 100644
--- a/INSTALL.cli
+++ b/INSTALL.cli
@@ -24,6 +24,20 @@ accordingly. Note that even if \c{/usr/local/lib} is searched at runtime, you
may still have to run \cb{ldconfig(1)} (as \c{root}) after the installation to
refresh the library cache.
+Note for Mac OS users: you will need version 10.5 (Leopard) or later. We will
+also be using the system C++ toolchain that comes with the Xcode Command Line
+Tools. To verify it is installed, run:
+
+\
+$ g++ --version
+\
+
+To install Command Line Tools, run:
+
+\
+$ xcode-select --install
+\
+
\dl|
\li|1. Installing SQLite\n
@@ -52,6 +66,24 @@ refresh the library cache.
# pkg install sqlite3
\
+ For Mac OS:
+
+ You should already have a system-default version installed. To verify:
+
+ \
+ $ ls /usr/include/sqlite3.h /usr/lib/libsqlite3.dylib
+ \
+
+ To see which version you have, run:
+
+ \
+ $ grep '#define SQLITE_VERSION' /usr/include/sqlite3.h
+ \
+
+ Any recent version (i.e., greater than 3.5.0) should work. If for some
+ reason you don't seem to have SQLite, download the source code then build
+ and install it into \c{/usr/local}.
+
|
\li|\n2. Installing \c{libodb} and \c{libodb-sqlite}\n
@@ -88,7 +120,7 @@ refresh the library cache.
$ cd build2-toolchain-X.Y.Z
$ cd build2/
$ ./bootstrap
- $ ./build/b-boot config.bin.rpath=/usr/local/lib update
+ $ ./build2/b-boot config.bin.rpath=/usr/local/lib update
\
For more information on this step (for example, how to specify the C++
@@ -100,7 +132,7 @@ refresh the library cache.
\
$ cd .. # back to build2-toolchain-X.Y.Z
- $ ./build2/build/b \
+ $ ./build2/build2/b \
config.cxx.poptions=-I/usr/local/include \
config.cxx.loptions=-L/usr/local/lib \
config.bin.rpath=/usr/local/lib \
@@ -108,8 +140,8 @@ refresh the library cache.
config.install.root.sudo=sudo \
configure
- $ ./build2/build/b update
- $ ./build2/build/b install
+ $ ./build2/build2/b update
+ $ ./build2/build2/b install
\
To test the installation, run: