Problem: libzmq pkg-config build not tested

Solution: build and install libzmq using autogen tools.
JinyongJeong · May 16, 2018 · 8dfec11 · 8dfec11
1 parent 6fe3d54
commit 8dfec11
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,9 +26,10 @@ matrix:
     - os: linux
       env: ZMQ_VERSION=4.2.5
 
-    # GCC default, draft disabled,  older libzmq
+    # GCC default, draft disabled,  older libzmq, libzmq with pkg-config
     - os: linux
-      env: ZMQ_VERSION=4.2.4
+      sudo: true
+      env: ZMQ_VERSION=4.2.0 BUILD_TYPE=pkgconf
 
     # GCC 7, draft enabled, latest libzmq
     - os: linux
@@ -49,8 +50,6 @@ matrix:
       # packages:
         # - clang-5.0
 
-sudo: false
-
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user cpp-coveralls; fi
 

diff --git a/ci_build.sh b/ci_build.sh
@@ -3,6 +3,7 @@
 set -x
 set -e
 
+BUILD_TYPE=${BUILD_TYPE:-cmake}
 LIBZMQ=${PWD}/libzmq-build
 CPPZMQ=${PWD}/cppzmq-build
 # Travis machines have 2 cores
@@ -19,11 +20,21 @@ install_zeromq() {
     curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \
       >zeromq.tar.gz
     tar -xvzf zeromq.tar.gz
-    cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
-                                              -DZMQ_BUILD_TESTS=OFF \
-                                              -DCMAKE_BUILD_TYPE=Release \
-                                              ${ZEROMQ_CMAKE_FLAGS}
-    cmake --build ${LIBZMQ} -- -j${JOBS}
+    if [ "$BUILD_TYPE" = "cmake" ] ; then
+        cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
+                                                  -DZMQ_BUILD_TESTS=OFF \
+                                                  -DCMAKE_BUILD_TYPE=Release \
+                                                  ${ZEROMQ_CMAKE_FLAGS}
+        cmake --build ${LIBZMQ} -- -j${JOBS}
+    elif [ "$BUILD_TYPE" = "pkgconf" ] ; then
+        pushd .
+        cd libzmq-${ZMQ_VERSION}
+        ./autogen.sh &&
+        ./configure &&
+        make VERBOSE=1 -j${JOBS}
+        sudo make install
+        popd
+    fi
 }
 
 # build zeromq first
@@ -34,6 +45,9 @@ if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi
 pushd .
 ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
 cmake --build ${CPPZMQ} -- -j${JOBS}
+if [ "$BUILD_TYPE" = "pkgconf" ] ; then
+    sudo cmake --build ${CPPZMQ} --target install
+fi
 cd ${CPPZMQ}
 ctest -V -j${JOBS}
 popd