use tweetnacl instead of libsodium

avoids need for building/bundling libsodium

- only set gcc-4.8 on Linux
- compile with -fPIC (because g++ errors said so!)
- only compile static libzmq

Author: minrk

.travis.yml

@@ -17,8 +17,9 @@ os:
 osx_image: xcode7.2
 
 env:
- - ZMQ="4.1.3" SODIUM="1.0.5" NODE_VERSION="5"
- - ZMQ="4.1.3" SODIUM="1.0.5" NODE_VERSION="4"
+ # libzmq-4.1.5 prerelease for tweetnacl build fixes
+ - ZMQ="b539733cee0f47f9bf1a70dc7cb7ff20410d3380" NODE_VERSION="5"
+ - ZMQ="b539733cee0f47f9bf1a70dc7cb7ff20410d3380" NODE_VERSION="4"
 
 before_install:
  - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
@@ -27,34 +28,23 @@ before_install:
  - nvm use $NODE_VERSION
  - node --version
  - npm --version
- - export CXX=g++-4.8
- - export CC=gcc-4.8
- - mkdir ldlocal
- - export LDHACK=`pwd`/ldlocal
- - export LDFLAGS=-L$LDHACK/lib
- - export CFLAGS=-I$LDHACK/include
- - export LD_RUN_PATH=$LDHACK/lib
- - export LD_LIBRARY_PATH=$LDHACK/lib
- - export PKG_CONFIG_PATH=$LDHACK/lib/pkgconfig
+ - test "$(uname)" = "Darwin"  || export CXX=g++-4.8 CC=gcc-4.8
+ - gcc --version
+ - mkdir zmq
+ - export ZMQ_PREFIX=`pwd`/zmq
+ - export CFLAGS=-fPIC
+ - export CXXFLAGS=-fPIC
+ - export PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig
  - echo $PKG_CONFIG_PATH
- - wget http://download.zeromq.org/zeromq-$ZMQ.tar.gz
+ - wget https://github.com/zeromq/zeromq4-1/archive/$ZMQ.tar.gz -O zeromq-$ZMQ.tar.gz
  - tar xzvf zeromq-$ZMQ.tar.gz
- - '[ -z "$SODIUM" ] || wget https://download.libsodium.org/libsodium/releases/libsodium-$SODIUM.tar.gz'
- - '[ -z "$SODIUM" ] || tar xzvf libsodium-$SODIUM.tar.gz'
- - '[ -z "$SODIUM" ] || cd libsodium-$SODIUM'
- - '[ -z "$SODIUM" ] || ./autogen.sh'
- - '[ -z "$SODIUM" ] || ./configure --prefix=$LDHACK'
- - '[ -z "$SODIUM" ] || make'
- - '[ -z "$SODIUM" ] || make install'
- - '[ -z "$SODIUM" ] || cd ..'
- - '[ -z "$SODIUM" ] || export LIBS=-lsodium && export sodium_CFLAGS=$CFLAGS && export sodium_LIBS=$LDFLAGS'
- - cd zeromq-$ZMQ
+ - cd zeromq4-1-$ZMQ
  - ./autogen.sh
- - if [[ -z "$SODIUM" ]]; then ./configure --prefix=$LDHACK; else ./configure --prefix=$LDHACK --with-libsodium=$LDHACK; fi
- - make
+ - ./configure --prefix=$ZMQ_PREFIX --with-tweetnacl --with-relaxed --enable-static --disable-shared
+ - V=1 make -j
  - make install
  - cd ..
 
-install: env LD_LIBRARY_PATH=$LDHACK/lib LD_RUN_PATH=$LDHACK/lib PKG_CONFIG_PATH=$LDHACK/lib/pkgconfig LDFLAGS=-L$LDHACK/lib CFLAGS=-I$LDHACK/lib/include npm install
+install: env PKG_CONFIG_PATH=$ZMQ_PREFIX/lib/pkgconfig npm install
 
 script: travis_retry npm test

binding.gyp

@@ -47,7 +47,6 @@
             '/usr/local/include',
           ],
           'libraries': [
-            '<!@(pkg-config libzmq --libs)',
             '-L/opt/local/lib',
             '-L/usr/local/lib',
           ]
@@ -56,19 +55,12 @@
           'include_dirs': [
             '<!@(pkg-config libzmq --cflags-only-I | sed s/-I//g)',
             '/usr/local/include',
-          ],
-          'libraries': [
-            '<!@(pkg-config libzmq --libs)',
-            '-L/usr/local/lib',
           ]
         }],
         ['OS=="linux"', {
           'cflags': [
             '<!(pkg-config libzmq --cflags 2>/dev/null || echo "")',
           ],
-          'libraries': [
-            '<!(pkg-config libzmq --libs 2>/dev/null || echo "")',
-          ],
         }],
       ]
     }