Skip to content

Commit

Permalink
epics-base: fix compilation due to GNUMake 4.4 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
minijackson committed Sep 15, 2023
1 parent 6ac8d74 commit 75856f2
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions pkgs/epnix/epics-base/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
fetchpatch,
version,
hash,
readline,
local_config_site ? {},
local_release ? {},
}:
with lib; let
older = versionOlder version;
atLeast = versionAtLeast version;

generateConf = (epnixLib.formats.make {}).generate;

Expand All @@ -37,11 +37,19 @@ in
inherit hash;
};

patches = optionals (older "7.0.5") [
# Support "undefine MYVAR" in convertRelease.pl
# Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
./handle-make-undefine-variable.patch
];
patches =
(optionals (atLeast "7.0.0") [
# From: https://github.com/epics-base/epics-base/pull/395
(fetchpatch {
url = "https://github.com/epics-base/epics-base/commit/d87fd0db0124faf450cff93226ae6a2cc02f02bf.patch";
hash = "sha256-BQWFOPCfRjSowDSAbqe8ClqEWT1OtfbgRh4k5jmAjpU=";
})
])
++ (optionals (older "7.0.5") [
# Support "undefine MYVAR" in convertRelease.pl
# Fixed by commit 79d7ac931502e1c25b247a43b7c4454353ac13a6
./handle-make-undefine-variable.patch
]);

# "build" as in Nix terminology (the build machine)
build_config_site =
Expand Down

0 comments on commit 75856f2

Please sign in to comment.