diff options
| -rw-r--r-- | INSTALL | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | curvetun/.gitignore | 2 | ||||
| -rwxr-xr-x | curvetun/nacl_build.sh (renamed from curvetun/build_nacl.sh) | 15 | ||||
| -rwxr-xr-x | curvetun/nacl_path.sh | 14 |
5 files changed, 24 insertions, 15 deletions
@@ -87,11 +87,11 @@ the tunneling software and the NaCl build process lasts quite long): (# make mrproper) In order to build curvetun, libnacl must be built first. A helper script -called build_nacl.sh is there to facilitate this process. If you want to +called nacl_build.sh is there to facilitate this process. If you want to build NaCl in the directory ~/nacl, the script should be called this way: $ cd curvetun - $ ./build_nacl.sh ~/nacl + $ ./nacl_build.sh ~/nacl There's also an abbreviation for this by simply typing: @@ -100,7 +100,7 @@ There's also an abbreviation for this by simply typing: This gives an initial output such as "Building NaCl for arch amd64 on host fuuubar (grab a coffee, this takes a while) ...". If the automatically detected architecture (such as amd64) is not the one you intend to compile -for, then edit the (cc="gcc") variable within the build_nacl.sh script to +for, then edit the (cc="gcc") variable within the nacl_build.sh script to your cross compiler. Yes, we know, the build system of NaCl is a bit of a pain, so you might check for a pre-built package from your distribution in case you are not cross compiling. @@ -254,7 +254,7 @@ $(TOOLS): nacl: $(Q)echo "$(bold)$(WHAT) $@:$(normal)" - $(Q)cd curvetun/ && ./build_nacl.sh ~/nacl + $(Q)cd curvetun/ && ./nacl_build.sh ~/nacl $(Q)source ~/.bashrc tarball.gz: ; $(call GIT_ARCHIVE,gzip,gz) diff --git a/curvetun/.gitignore b/curvetun/.gitignore index d834aa2..ad9d744 100644 --- a/curvetun/.gitignore +++ b/curvetun/.gitignore @@ -3,5 +3,5 @@ !.gitignore !Makefile !abiname.c -!build_nacl.sh +!nacl_build.sh !nacl_path.sh diff --git a/curvetun/build_nacl.sh b/curvetun/nacl_build.sh index 7a97302..df6027a 100755 --- a/curvetun/build_nacl.sh +++ b/curvetun/nacl_build.sh @@ -1,9 +1,14 @@ #!/bin/bash - -# netsniff-ng - the packet sniffing beast -# By Emmanuel Roullit <emmanuel@netsniff-ng.org> -# Copyright 2009, 2011 Emmanuel Roullit. -# Subject to the GPL, version 2. +# -*- coding: utf-8 -*- +# +# nacl_build.sh -- NaCl library build script +# +# Copyright (C) 2011 Daniel Borkmann <borkmann@redhat.com> +# Copyright (C) 2009-2011 Emmanuel Roullit <emmanuel@netsniff-ng.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. cc="gcc" nacl_dir="/tmp" diff --git a/curvetun/nacl_path.sh b/curvetun/nacl_path.sh index 1afc6d2..9f492ba 100755 --- a/curvetun/nacl_path.sh +++ b/curvetun/nacl_path.sh @@ -1,9 +1,13 @@ #!/bin/bash - -# netsniff-ng - the packet sniffing beast -# By Emmanuel Roullit <emmanuel@netsniff-ng.org> -# Copyright 2009, 2011 Emmanuel Roullit. -# Subject to the GPL, version 2. +# -*- coding: utf-8 -*- +# +# nacl_path.sh -- NaCl path export script +# +# Copyright (C) 2009-2011 Emmanuel Roullit <emmanuel@netsniff-ng.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. nacl_include_path="$1" nacl_lib_path="$2" |