X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=README.Git;h=b666c06d816c1cd0150779d68245204278b9a4b6;hb=e784ed9c161b6b7aec1402de566e6c09cb2031e0;hp=b9ed2222fca9d9639bd697296acfe40e3c6a32e2;hpb=0df9cdd3df66caf4353128feff3008289cda8115;p=pspp
diff --git a/README.Git b/README.Git
index b9ed2222fc..b666c06d81 100644
--- a/README.Git
+++ b/README.Git
@@ -2,14 +2,14 @@ Prerequisites for Building PSPP from Git
----------------------------------------
To build this project from the sources direct from the Git archive,
-you must install the prerequisites listed in README, plus the
+you must install the prerequisites listed in INSTALL, plus the
following:
- * Autoconf 2.60 (or later).
+ * Autoconf 2.64 (or later).
- * Automake 1.10 (or later).
+ * Automake 1.14 (or later).
- * Gettext 0.17 (or later).
+ * Gettext 0.19 (or later).
* GNU M4 1.4.9 (or later).
@@ -21,9 +21,9 @@ following:
* libtool 1.5.22 (or later).
- * Texinfo 4.7 or later, to build the documentation.
+ * Texinfo 5.2 or later, to build the documentation.
- * Gimp -- 2.8.2 is known to work
+ * rsvg-convert from librsvg2.
After you install PSPP's prerequisites, you must obtain a copy of
Gnulib, then bootstrap the tree, as described in the sections below.
@@ -36,14 +36,13 @@ This version of PSPP should work with the Gnulib commit shown below.
Gnulib does not maintain a stable API or ABI, so it is possible that
PSPP will not work with older or newer versions of Gnulib.
- commit c5c4f53b31f1ad04f4033a6124120ffec9257847
- Author: Pádraig Brady
- Date: Sat Dec 6 01:14:02 2014 +0000
+ commit ff24917703530849f3b109905d437337cdeeab14
+ Author: Bruno Haible
+ Date: Fri Jun 3 17:46:27 2022 +0200
- vasnprintf: fix potential use after free
+ setlocale: Update after Turkey changed its name.
- * lib/vasnprintf.c (VASNPRINTF): Fix free-memory read,
- flagged by clang-analyzer 3.4.2.
+ * lib/setlocale.c: Update comments.
To clone Gnulib into a directory named "gnulib" using Git, and then
check out this particular commit, run these commands:
@@ -79,3 +78,38 @@ Once PSPP is built, you may run its self-tests with:
make check
or for a more thorough test:
make distcheck
+
+Building from git on Mac OS
+---------------------------
+
+You can build on MacOS in the macports environment. After installing all
+required packages to resolve library dependencies and autotools e.t.c, you
+run make -f Smake as described above.
+
+The macports system provides the libraries and header files in a separate
+location from the MacOS system libraries. The typical locations are
+
+Libraries: /opt/local/lib
+Headers: /opt/local/include
+
+pspp under macports will be linked against the macports libraries. The configure
+script has to be informed about the library and header locations. Assume the following
+directory structure for an out of tree build:
+
+~/mypspp
+ |----pspp (This is the pspp git directory)
+ |----install (The install location containing also ui files for psppire)
+ |----build (The build directory)
+ |----gnulib (The gnulib directory as described above)
+
+Then you can build with the following commands:
+
+ cd ~/mypspp/pspp
+ make -f Smake
+ cd ../build
+ ../pspp/configure --prefix=/Users/USER/mypspp/install \
+ LDFLAGS=-L/opt/local/lib \
+ CPPFLAGS=-I/opt/local/include
+ make
+ make install
+ ../install/bin/psppire (If everything worked, you should see psppire...)