From b9abdd65775c9629f0d6fe70356885f5619b8e2b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 10 Mar 2019 13:45:11 +0100
Subject: Fix build on x86 32bit

Conflict of macro name with a struct field in one of our headers.

diff --git a/psi/estack.h b/psi/estack.h
index f092eee..75e8d6c 100644
--- a/psi/estack.h
+++ b/psi/estack.h
@@ -18,6 +18,8 @@
 #ifndef estack_INCLUDED
 #  define estack_INCLUDED
 
+#include <signal.h> /* before we #define esp, which prevents it from building */
+
 #include "iestack.h"
 #include "icstate.h"		/* for access to exec_stack */
 
-- 
2.37.3


From 233b3e169134821ec659a68471e4f1f6c625dac6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 13 Mar 2019 21:14:28 +0100
Subject: fix building shared libs


diff --git a/configure.ac b/configure.ac
index 09d881d..16cdfc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3116,7 +3116,7 @@ case $host in
       GPDL_SONAME_MAJOR="lib\$(GPDL${libname3}"
       GPDL_SONAME_MAJOR_MINOR="cyg\$(GPDL${libname2}"
     ;;
-    *bsd*)
+    *bsd*|*haiku*)
       DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
       GS_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
       PCL_DYNAMIC_LDFLAGS="-shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
-- 
2.37.3


From 3babc55bc15a3aa5b09f72ceebde76d470667cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 31 Oct 2021 22:03:15 +0100
Subject: fix looking for dlopen in libdl only


diff --git a/configure.ac b/configure.ac
index 16cdfc4..83f2413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,8 +661,8 @@ if test "x$ac_cv_header_inttypes_h" = "xyes"; then
         GCFLAGS="$GCFLAGS -DHAVE_INTTYPES_H=1"
 fi
 
-AC_CHECK_LIB([dl], [dlopen],
-             [AC_CHECK_HEADER([dlfcn.h], [GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1";LIBS="-ldl $LIBS"])]
+AC_SEARCH_LIBS([dlopen], [dl],
+             [AC_CHECK_HEADER([dlfcn.h], [GCFLAGS="$GCFLAGS -DHAVE_LIBDL=1"])]
               )
 
 large_color_index=1
-- 
2.37.3


From c362a5d4e2c5a6f854d3d3b37c8f7615b1c7fab4 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Wed, 2 Mar 2022 21:15:32 +0100
Subject: debug flags for haiku


diff --git a/configure.ac b/configure.ac
index 83f2413..6b1b8ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,7 @@ SET_DT_SONAME="-soname="
 CFLAGS_LARGEFILE=""
 
 case $host in
-        *-linux*|*-gnu)
+        *-linux*|*-gnu|*-haiku)
         if test x"$GCC" = x"yes"; then
             CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
             CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
-- 
2.37.3


From 202312aa9d140c49f49bb9e21cd937d33de320d9 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Fri, 4 Mar 2022 05:47:01 +0100
Subject: -g


diff --git a/configure.ac b/configure.ac
index 6b1b8ce..9679fc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,7 +283,7 @@ case $host in
         *-linux*|*-gnu|*-haiku)
         if test x"$GCC" = x"yes"; then
             CC_OPT_FLAGS_TO_TRY="-O2 -DNDEBUG"
-            CC_DBG_FLAGS_TO_TRY="-gdwarf-2 -g3 -O0"
+            CC_DBG_FLAGS_TO_TRY="-g"
             CC_VISIBILITY_FLAGS_TO_TRY="-fvisibility=hidden"
         fi
         ;;
-- 
2.37.3


From f8c012fb7e828d7e624f30a9d7b6763702cea867 Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Thu, 10 Mar 2022 17:11:47 +0100
Subject: debug flags


diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index 7c11d89..c8bd4a0 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -431,7 +431,8 @@ soinstall:
 	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget BUILDDIRPREFIX=$(SODIRPREFIX)
 
 sodebuginstall:
-	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='-DDEBUG' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
+	GENOPT='-DDEBUG -g'
+	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='$(GENOPT)' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
 
 soinstall-subtarget: install-so install-scripts install-data $(INSTALL_SHARED) $(INSTALL_CONTRIB)
 
-- 
2.37.3


From 0c2ecf495fd2440ea3af17664e60485406e2866b Mon Sep 17 00:00:00 2001
From: Anarchos <sylvain_kerjean@hotmail.com>
Date: Thu, 10 Mar 2022 21:44:39 +0100
Subject: revert


diff --git a/base/unix-dll.mak b/base/unix-dll.mak
index c8bd4a0..7c11d89 100644
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@ -431,8 +431,7 @@ soinstall:
 	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget BUILDDIRPREFIX=$(SODIRPREFIX)
 
 sodebuginstall:
-	GENOPT='-DDEBUG -g'
-	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='$(GENOPT)' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
+	$(MAKE) $(SUB_MAKE_OPTION) soinstall-subtarget GENOPT='-DDEBUG' BUILDDIRPREFIX=$(SODEBUGDIRPREFIX)
 
 soinstall-subtarget: install-so install-scripts install-data $(INSTALL_SHARED) $(INSTALL_CONTRIB)
 
-- 
2.37.3