epics-base: fix compilation due to GNUMake 4.4 upgrade

epics-extensions · Jul 3, 2023 · d0f5370 · d0f5370
1 parent c53296b
commit d0f5370
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/pkgs/epnix/epics-base/default.nix b/pkgs/epnix/epics-base/default.nix
@@ -5,10 +5,8 @@
   buildPackages,
   mkEpicsPackage,
   fetchgit,
-  fetchpatch,
   version,
   hash,
-  readline,
   local_config_site ? {},
   local_release ? {},
 }:
@@ -37,11 +35,14 @@ in
       inherit hash;
     };
 
-    patches = optionals (older "7.0.5") [
+    patches = [
+      # From: https://github.com/epics-base/epics-base/pull/395
+      ./fix-makeflags-parsing-4.4.patch
+    ] ++ (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 =

diff --git a/pkgs/epnix/epics-base/fix-makeflags-parsing-4.4.patch b/pkgs/epnix/epics-base/fix-makeflags-parsing-4.4.patch
@@ -0,0 +1,15 @@
+diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON
+index 19b26c24c..742e54ae4 100644
+--- a/configure/CONFIG_COMMON
++++ b/configure/CONFIG_COMMON
+@@ -83,8 +83,9 @@ IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
+
+ #-------------------------------------------------------
+ # How to portably check the flags to make
++makeflags := $(firstword $(filter-out -,$(filter-out --%,$(MAKEFLAGS))))
+ define checkflags
+-  make-$1 = $(findstring $1,$(filter-out --%,$(MAKEFLAGS)))
++  make-$1 := $(findstring $1,$(makeflags))
+ endef
+ # This is extensible to most single letter flags:
+ $(foreach flag,s q, $(eval $(call checkflags,$(flag))))