build_matrix.sh: Update the SETUP line and the 'Build libpcap' printings

diff --git a/build_matrix.sh b/build_matrix.sh
index b9bb7cd05e976da8689a917205bfe52298343a25..304ce57534a36192e3a297ccaa7df04cf3a4f068 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -47,7 +47,7 @@ build_tcpdump() {
                 for SMB in ${MATRIX_SMB:-no yes}; do
                     export SMB
                     COUNT=$((COUNT+1))
                 for SMB in ${MATRIX_SMB:-no yes}; do
                     export SMB
                     COUNT=$((COUNT+1))

-                    echo_magenta "===== SETUP $COUNT: build_libpcap:$BUILD_LIBPCAP remote:${REMOTE:-?} compiler:$CC cmake:$CMAKE crypto:$CRYPTO smb:$SMB ====="
+                    echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB ====="

                     # LABEL is needed to build the travis fold labels
                     LABEL="$BUILD_LIBPCAP.$REMOTE.$CC.$CMAKE.$CRYPTO.$SMB"
                     # Run one build with setup environment variables:
                     # LABEL is needed to build the travis fold labels
                     LABEL="$BUILD_LIBPCAP.$REMOTE.$CC.$CMAKE.$CRYPTO.$SMB"
                     # Run one build with setup environment variables:


@@ -75,7 +75,7 @@ choose_libpcap() {
         # Build libpcap with autoconf
         CMAKE_SAVE=$CMAKE
         CMAKE=no
         # Build libpcap with autoconf
         CMAKE_SAVE=$CMAKE
         CMAKE=no

-        echo_magenta "Build libpcap (cmake:$CMAKE remote:$REMOTE)"
+        echo_magenta "Build libpcap (CMAKE=$CMAKE REMOTE=$REMOTE)"

         (cd ../libpcap && ./build.sh && make distclean)
         CMAKE=$CMAKE_SAVE
     fi
         (cd ../libpcap && ./build.sh && make distclean)
         CMAKE=$CMAKE_SAVE
     fi