From: Augustin Degomme <adegomme@gmail.com>
Date: Fri, 22 Apr 2022 18:21:29 +0000 (+0000)
Subject: try to use ns3-dev on ubuntu.
X-Git-Tag: v3.32~306
X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/131e35f37d73183652d2d281e85ba09a169ab4f6

try to use ns3-dev on ubuntu.
---

diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh
index 5e94d83067..6ad94b0fa7 100755
--- a/tools/jenkins/build.sh
+++ b/tools/jenkins/build.sh
@@ -151,10 +151,10 @@ if [ "$os" = "Debian" ] ; 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
+MAY_HINT_AT_NS3=""
+if [ $NODE_NAME = "ubuntu-lts" ] ; then
+  MAY_HINT_AT_NS3="-DNS3_HINT=/builds/ns-3-dev/build/"
+  have_NS3="yes"
 fi
 if [ "$os" = "nixos" ] ; then
   have_NS3="yes"
@@ -227,7 +227,7 @@ cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \
   -Denable_compile_warnings=$(onoff test "$GENERATOR" != "MSYS Makefiles") -Denable_smpi=ON \
   -Denable_ns3=$(onoff test "$have_NS3" = "yes" -a "$build_mode" = "Debug") \
   -DSIMGRID_PYTHON_LIBDIR=${SIMGRID_PYTHON_LIBDIR} \
-  ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} \
+  ${MAY_DISABLE_SOURCE_CHANGE} ${MAY_DISABLE_LTO} ${MAY_HINT_AT_NS3} \
   -Denable_java=$(onoff test "$build_mode" = "ModelChecker") \
   -Denable_msg=$(onoff test "$build_mode" = "ModelChecker") \
   -DLTO_EXTRA_FLAG="auto" \