Update build documentation for mac to include sequoia doc_update_sequoia
authorDavid
Wed, 31 Jul 2019 08:49:34 +0200
branchdoc_update_sequoia
changeset 39423453d05cbe9a
parent 3473 9cd6a0ad3c74
Update build documentation for mac to include sequoia
doc/build-macos.md
     1.1 --- a/doc/build-macos.md	Tue Apr 09 09:26:27 2019 +0200
     1.2 +++ b/doc/build-macos.md	Wed Jul 31 08:49:34 2019 +0200
     1.3 @@ -19,8 +19,6 @@
     1.4  sudo port install py27-lxml
     1.5  # libetpan
     1.6  sudo port install git autoconf automake libtool
     1.7 -# asn1c
     1.8 -sudo port install asn1c
     1.9  # engine
    1.10  sudo port install gpgme
    1.11  ~~~
    1.12 @@ -31,6 +29,8 @@
    1.13  sudo port select python python27
    1.14  ~~~
    1.15  
    1.16 +
    1.17 +
    1.18  ## Homebrew
    1.19  Install Homebrew according to the instructions found [here](https://docs.brew.sh/Installation.html).
    1.20  Ensure that Homebrew's binary path (`/usr/local/bin`) is in your `PATH` environment variable.
    1.21 @@ -44,10 +44,11 @@
    1.22  pip2 install --user lxml
    1.23  # libetpan
    1.24  brew install git autoconf automake libtool
    1.25 -# asn1c
    1.26 -brew install asn1c
    1.27 -# engine
    1.28 -brew install gpgme
    1.29 +# engine / sequoia
    1.30 +brew install capnp 
    1.31 +brew install pkg-config
    1.32 +brew install nettle
    1.33 +brew install coreutils
    1.34  ~~~
    1.35  
    1.36  # Installing unpackaged dependencies
    1.37 @@ -69,6 +70,16 @@
    1.38  hg clone https://pep.foundation/dev/repos/yml2/ ~/code/yml2
    1.39  ~~~
    1.40  
    1.41 +# asn1c
    1.42 +git clone git://github.com/vlm/asn1c.git ~/code/asn1c
    1.43 +cd ~/code/asn1c
    1.44 +git checkout tags/v0.9.28 -b pep-engine
    1.45 +autoreconf -iv
    1.46 +mkdir ~/code/asn1c/build
    1.47 +./configure --prefix="$HOME/code/asn1c/build"
    1.48 +make
    1.49 +make install
    1.50 +
    1.51  ## libetpan
    1.52  pEp Engine requires libetpan with a set of patches that have not been upstreamed yet.
    1.53  
    1.54 @@ -82,19 +93,23 @@
    1.55  make install
    1.56  ~~~
    1.57  
    1.58 -## GPGME
    1.59 -The MacPorts-packaged GPGME links to a version of GNU libiconv that has files in the same include/library paths as GPGME. This version of libiconv must not be visible to the linker when the pEp Engine is build or run.
    1.60 +## Sequoia
    1.61  
    1.62 -Thus the files of the GPGME distribution will have to be manually copied to separate include/library folders, so that no include or library paths used for building the pEp Engine contains files of MacPorts' libiconv distribution.
    1.63 -
    1.64 +Install rustup
    1.65  ~~~
    1.66 -mkdir -p ~/code/gpgme/build/include
    1.67 -cp /opt/local/include/gpg*.h ~/code/gpgme/build/include
    1.68 -mkdir -p ~/code/gpgme/build/lib
    1.69 -cp -r /opt/local/lib/libgpg* ~/code/gpgme/build/lib
    1.70 +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
    1.71  ~~~
    1.72  
    1.73 -It's of course possible to skip MacPort's version, and use a self-compiled GPGME/GPG. The default build configuration assumes this case, and assumes you have installed your GPGME with `$(HOME)` as your prefix.
    1.74 +Proceed with the default installation and restart the console in order to add cargo to your $PATH
    1.75 +
    1.76 +Clone and build the sequoia project
    1.77 +~~~
    1.78 +mkdir -p ~/code/sequoia
    1.79 +git clone https://gitlab.com/sequoia-pgp/sequoia.git ~/code/sequoia
    1.80 +cd ~/code/sequoia
    1.81 +make
    1.82 +make install
    1.83 +~~~
    1.84  
    1.85  # pEp Engine
    1.86  
    1.87 @@ -122,8 +137,8 @@
    1.88  ETPAN_LIB=-L$(HOME)/code/libetpan/build/lib
    1.89  ETPAN_INC=-I$(HOME)/code/libetpan/build/include
    1.90  
    1.91 -GPGME_LIB=-L$(HOME)/lib
    1.92 -GPGME_INC=-I$(HOME)/include
    1.93 +OPENPGP=SEQUOIA
    1.94 +
    1.95  ~~~
    1.96  
    1.97  The engine is built as follows: