4 files changed, 21 insertions, 10 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index cc84b5f139e7..e86276e6744a 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
     external/firebird/msvc.patch \
     external/firebird/wnt-per-process-trace-storage.patch.1 \
     external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
+    external/firebird/configure-include.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/configure-include.patch b/external/firebird/configure-include.patch
new file mode 100644
index 000000000000..fe2935f139d7
--- /dev/null
+++ b/external/firebird/configure-include.patch
@@ -0,0 +1,18 @@
+--- configure
++++ configure
+@@ -21478,6 +21478,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ #include <semaphore.h>
+ main () {
+   struct s {
+@@ -21514,6 +21515,7 @@
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ main () {
+   struct s {
+     char a;
diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch
index 7f4332633316..a19a2798f405 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -29,10 +29,10 @@
 
 --- configure	2016-07-07 15:57:04.538983200 +0200
 +++ configure	2016-07-13 11:31:18.132820200 +0200
-@@ -21473,13 +21473,12 @@
- else
+@@ -21490,13 +21490,12 @@
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
+ #include <stdlib.h>
 -#include <semaphore.h>
  main () {
    struct s {
diff --git a/external/firebird/macos-arm64.patch.0 b/external/firebird/macos-arm64.patch.0
index 12a845c57ce9..ab2596dbd987 100644
--- a/external/firebird/macos-arm64.patch.0
+++ b/external/firebird/macos-arm64.patch.0
@@ -24,14 +24,6 @@
    i*86-*-darwin*)
      MAKEFILE_PREFIX=darwin_i386
      MAKEFILE_POSTFIX=darwin
-@@ -21344,6 +21344,7 @@
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#include <stdlib.h>
- main () {
-   struct s {
-     char a;
 --- src/common/common.h
 +++ src/common/common.h
 @@ -234,6 +234,12 @@