From 5ceefb161518b0649dd386a1d3c406a55bd424da Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 15 Jun 2014 11:55:47 +0200 Subject: [PATCH] Fix the cross-compiling examples. - Use << 'EOF' (with single quotes) to prevent variable expansion - apt-get install quilt, because we need that when building OpenSSL - Use --with-zlib=... instead of --with-openssl Thanks to Jacob for pointing out these issues. --- examples/cross-compiling-64-bit-windows-binary.mdwn | 6 +++--- examples/cross-compiling-windows-binary.mdwn | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/cross-compiling-64-bit-windows-binary.mdwn b/examples/cross-compiling-64-bit-windows-binary.mdwn index b44c37f..a3bb24f 100644 --- a/examples/cross-compiling-64-bit-windows-binary.mdwn +++ b/examples/cross-compiling-64-bit-windows-binary.mdwn @@ -21,7 +21,7 @@ The idea is simple: There are only a few packages that need to be installed as root to get started: - sudo apt-get install mingw-w64 git-core wget + sudo apt-get install mingw-w64 git-core wget quilt sudo apt-get build-dep tinc Other Linux distributions may also have 64-bit MinGW packages, use their respective @@ -49,7 +49,7 @@ up the necessary environment variables so configure scripts and Makefiles will use the 64-bit MinGW version of GCC and binutils: mkdir $HOME/bin - cat >$HOME/bin/mingw64 << EOF + cat >$HOME/bin/mingw64 << 'EOF' #!/bin/sh PREFIX=x86_64-w64-mingw32 export CC=$PREFIX-gcc @@ -118,5 +118,5 @@ this is not necessary. cd $HOME/mingw64/tinc autoreconf -fsi - ./configure --host=x86_64-w64-mingw32 --with-openssl=$HOME/mingw64/usr/local + ./configure --host=x86_64-w64-mingw32 --with-zlib=$HOME/mingw64/usr/local make diff --git a/examples/cross-compiling-windows-binary.mdwn b/examples/cross-compiling-windows-binary.mdwn index 3e3bd16..3fc4ae8 100644 --- a/examples/cross-compiling-windows-binary.mdwn +++ b/examples/cross-compiling-windows-binary.mdwn @@ -24,7 +24,7 @@ The idea is simple: There are only a few packages that need to be installed as root to get started: - sudo apt-get install mingw-w64 wine git-core + sudo apt-get install mingw-w64 wine git-core quilt sudo apt-get build-dep tinc Other Linux distributions may also have MinGW packages, use their respective @@ -52,7 +52,7 @@ up the necessary environment variables so configure scripts and Makefiles will use the MinGW version of GCC and binutils: mkdir $HOME/bin - cat >$HOME/bin/mingw << EOF + cat >$HOME/bin/mingw << 'EOF' #!/bin/sh PREFIX=i686-w64-mingw32 export CC=$PREFIX-gcc -- 2.20.1