From a4b8f8e94be7413816fef8ff01437162ec595614 Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Mallo Date: Tue, 6 Apr 2021 19:19:24 +0200 Subject: [PATCH] apps: disable hardening in all garlic apps --- garlic/apps/bigsort/default.nix | 2 ++ garlic/apps/bigsort/genseq.nix | 2 ++ garlic/apps/bigsort/shuffle.nix | 2 ++ garlic/apps/cpic/default.nix | 2 ++ garlic/apps/creams/default.nix | 4 ++-- garlic/apps/creams/input.nix | 2 ++ garlic/apps/fwi/default.nix | 2 ++ garlic/apps/fwi/params.nix | 2 ++ garlic/apps/heat/default.nix | 2 ++ garlic/apps/hpccg/default.nix | 1 + garlic/apps/hpcg/default.nix | 1 + garlic/apps/ifsker/default.nix | 1 + garlic/apps/lulesh/default.nix | 1 + garlic/apps/miniamr/default.nix | 1 + garlic/apps/nbody/default.nix | 1 + garlic/apps/ppong/default.nix | 1 + garlic/apps/saiph/default.nix | 5 ++--- 17 files changed, 27 insertions(+), 5 deletions(-) diff --git a/garlic/apps/bigsort/default.nix b/garlic/apps/bigsort/default.nix index 21c5aa2d..c3f7d1b9 100644 --- a/garlic/apps/bigsort/default.nix +++ b/garlic/apps/bigsort/default.nix @@ -48,4 +48,6 @@ stdenv.mkDerivation rec { ''; programPath = "/bin/BigSort"; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/bigsort/genseq.nix b/garlic/apps/bigsort/genseq.nix index 2071d51f..09adb25c 100644 --- a/garlic/apps/bigsort/genseq.nix +++ b/garlic/apps/bigsort/genseq.nix @@ -40,4 +40,6 @@ stdenv.mkDerivation rec { ''; programPath = "/bin/genseq"; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/bigsort/shuffle.nix b/garlic/apps/bigsort/shuffle.nix index 62623775..c19366e4 100644 --- a/garlic/apps/bigsort/shuffle.nix +++ b/garlic/apps/bigsort/shuffle.nix @@ -40,4 +40,6 @@ stdenv.mkDerivation rec { ''; programPath = "/bin/shuffle"; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/cpic/default.nix b/garlic/apps/cpic/default.nix index b6b14807..284c1e97 100644 --- a/garlic/apps/cpic/default.nix +++ b/garlic/apps/cpic/default.nix @@ -38,4 +38,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp cpic $out/bin/cpic ''; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/creams/default.nix b/garlic/apps/creams/default.nix index cdcc14ea..c083886a 100644 --- a/garlic/apps/creams/default.nix +++ b/garlic/apps/creams/default.nix @@ -37,8 +37,6 @@ in buildInputs = [ nanos6 mpi cc tampi mcxx ]; - hardeningDisable = [ "all" ]; - configurePhase = '' export TAMPI_HOME=${tampi} @@ -54,4 +52,6 @@ in mkdir -p $out/bin cp -a build/* $out/bin ''; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/creams/input.nix b/garlic/apps/creams/input.nix index 8febb5bf..1749a722 100644 --- a/garlic/apps/creams/input.nix +++ b/garlic/apps/creams/input.nix @@ -33,4 +33,6 @@ in mkdir -p $out cp -a SodTubeBenchmark $out/ ''; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/fwi/default.nix b/garlic/apps/fwi/default.nix index f58a2aff..d826e7f3 100644 --- a/garlic/apps/fwi/default.nix +++ b/garlic/apps/fwi/default.nix @@ -71,4 +71,6 @@ in ''; programPath = "/bin/fwi"; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/fwi/params.nix b/garlic/apps/fwi/params.nix index 97e27abd..8dce26b0 100644 --- a/garlic/apps/fwi/params.nix +++ b/garlic/apps/fwi/params.nix @@ -59,4 +59,6 @@ in mkdir -p $out/bin cp ModelGenerator $out/bin/ ''; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/heat/default.nix b/garlic/apps/heat/default.nix index e9223222..02e8b762 100644 --- a/garlic/apps/heat/default.nix +++ b/garlic/apps/heat/default.nix @@ -34,4 +34,6 @@ in mkdir -p $out/etc cp heat.conf $out/etc/ ''; + + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/hpccg/default.nix b/garlic/apps/hpccg/default.nix index 5af59b3b..91937368 100644 --- a/garlic/apps/hpccg/default.nix +++ b/garlic/apps/hpccg/default.nix @@ -50,4 +50,5 @@ in cp test_HPCCG-mpi.exe $out/bin ''; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/hpcg/default.nix b/garlic/apps/hpcg/default.nix index 25faa87a..245012ec 100644 --- a/garlic/apps/hpcg/default.nix +++ b/garlic/apps/hpcg/default.nix @@ -40,4 +40,5 @@ in programPath = "/bin/xhpcg"; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/ifsker/default.nix b/garlic/apps/ifsker/default.nix index 2b3e0013..5ec28fa7 100644 --- a/garlic/apps/ifsker/default.nix +++ b/garlic/apps/ifsker/default.nix @@ -55,4 +55,5 @@ in programPath = "/bin/${name}"; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/lulesh/default.nix b/garlic/apps/lulesh/default.nix index 5a43ee53..d5202c53 100644 --- a/garlic/apps/lulesh/default.nix +++ b/garlic/apps/lulesh/default.nix @@ -43,4 +43,5 @@ in ''; programPath = "/bin/${name}"; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/miniamr/default.nix b/garlic/apps/miniamr/default.nix index cc0450b4..f005ead9 100644 --- a/garlic/apps/miniamr/default.nix +++ b/garlic/apps/miniamr/default.nix @@ -43,4 +43,5 @@ stdenv.mkDerivation rec { programPath = "/bin/miniAMR.x"; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/nbody/default.nix b/garlic/apps/nbody/default.nix index 525d52a6..f003261d 100644 --- a/garlic/apps/nbody/default.nix +++ b/garlic/apps/nbody/default.nix @@ -54,4 +54,5 @@ in cp nbody* $out/bin/${name} ''; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/ppong/default.nix b/garlic/apps/ppong/default.nix index 2a4c3999..09a72a4d 100644 --- a/garlic/apps/ppong/default.nix +++ b/garlic/apps/ppong/default.nix @@ -31,4 +31,5 @@ stdenv.mkDerivation { ''; buildInputs = [ mpi ]; + hardeningDisable = [ "all" ]; } diff --git a/garlic/apps/saiph/default.nix b/garlic/apps/saiph/default.nix index 6118afdf..c09c1f7f 100644 --- a/garlic/apps/saiph/default.nix +++ b/garlic/apps/saiph/default.nix @@ -62,9 +62,6 @@ in vtk boost ]; - - # Required for nanos6 - hardeningDisable = [ "all" ]; preBuild = '' cd saiphv2/cpp/src @@ -103,4 +100,6 @@ in cp obj/libsaiphv2.so $out/lib/ cp bin/Heat3D_vect $out/bin/ ''; + + hardeningDisable = [ "all" ]; }