CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / build_matrix.sh

diff --git a/build_matrix.sh b/build_matrix.sh
index f37589fac71877683e364711ee4d13b4f49f6670..93daca63b5cb3d27117e149e42745e68cb6836ca 100755 (executable)
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -7,7 +7,7 @@
 # MATRIX_BUILD_LIBPCAP, MATRIX_REMOTE, MATRIX_CC, MATRIX_CMAKE, MATRIX_CRYPTO
 # and MATRIX_SMB.
 
 # MATRIX_BUILD_LIBPCAP, MATRIX_REMOTE, MATRIX_CC, MATRIX_CMAKE, MATRIX_CRYPTO
 # and MATRIX_SMB.
 

-: "${MATRIX_BUILD_LIBPCAP:=no yes}"
+: "${MATRIX_BUILD_LIBPCAP:=yes no}"

 : "${MATRIX_REMOTE:=no}"
 : "${MATRIX_CC:=gcc clang}"
 : "${MATRIX_CMAKE:=no yes}"
 : "${MATRIX_REMOTE:=no}"
 : "${MATRIX_CC:=gcc clang}"
 : "${MATRIX_CMAKE:=no yes}"


@@ -50,7 +50,7 @@ build_tcpdump() {
             for SMB in $MATRIX_SMB; do
                 export SMB
                 COUNT=`increment "$COUNT"`
             for SMB in $MATRIX_SMB; do
                 export SMB
                 COUNT=`increment "$COUNT"`

-                echo_magenta "===== SETUP $COUNT: BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CC=$CC CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2
+                echo_magenta "===== SETUP $COUNT: CC=$CC BUILD_LIBPCAP=$BUILD_LIBPCAP REMOTE=${REMOTE:-?} CMAKE=$CMAKE CRYPTO=$CRYPTO SMB=$SMB =====" >&2

                 # Run one build with setup environment variables:
                 # BUILD_LIBPCAP, REMOTE, CC, CMAKE, CRYPTO and SMB
                 run_after_echo ./build.sh
                 # Run one build with setup environment variables:
                 # BUILD_LIBPCAP, REMOTE, CC, CMAKE, CRYPTO and SMB
                 run_after_echo ./build.sh


@@ -67,6 +67,7 @@ build_tcpdump() {
     done
 }
 
     done
 }
 

+run_after_echo git show --oneline -s | cat

 touch .devel
 for CC in $MATRIX_CC; do
     export CC
 touch .devel
 for CC in $MATRIX_CC; do
     export CC