Disable ns3 on ubuntu until version 3.36.

[simgrid.git] / tools / jenkins / build.sh

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 8abe068..3dea3ca 100755 (executable)
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -146,11 +146,16 @@ mkdir "$WORKSPACE"/build
 cd "$WORKSPACE"/build
 
 have_NS3="no"
-if [ "$os" = "Debian" ] || [ "$os" = "Ubuntu" ] ; then
+if [ "$os" = "Debian" ] ; then
   if dpkg --compare-versions "$(dpkg-query -f '${Version}' -W libns3-dev)" ge 3.28; then
     have_NS3="yes"
   fi
 fi
+if [ "$os" = "Ubuntu" ] ; then
+  if dpkg --compare-versions "$(dpkg-query -f '${Version}' -W libns3-dev)" ge 3.36; then
+    have_NS3="yes"
+  fi
+fi
 if [ "$os" = "nixos" ] ; then
   have_NS3="yes"
 fi
@@ -204,10 +209,6 @@ if [ "$os" = "CentOS" ]; then
     else
         MAY_DISABLE_LTO=
     fi
-    if [ "$(rpm -q eigen3-devel --qf '%{VERSION}')" = "3.3.4" ]; then
-        echo "Temporary avoid build error seen with eigen3 version 3.3.4"
-        export CXXFLAGS=-Wno-error=int-in-bool-context
-    fi
 fi
 
 cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \