From d0f5370b106acd88b14d3ff07d69f053a147cae7 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 3 Jul 2023 10:34:30 +0200
Subject: [PATCH] epics-base: fix compilation due to GNUMake 4.4 upgrade

---
 pkgs/epnix/epics-base/default.nix                 |  9 +++++----
 .../epics-base/fix-makeflags-parsing-4.4.patch    | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/epnix/epics-base/fix-makeflags-parsing-4.4.patch

diff --git a/pkgs/epnix/epics-base/default.nix b/pkgs/epnix/epics-base/default.nix
index a784ccf1..980a3f50 100644
--- 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
new file mode 100644
index 00000000..3b8541a0
--- /dev/null
+++ 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))))