mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-14 15:50:07 +02:00
166 lines
4.8 KiB
Plaintext
166 lines
4.8 KiB
Plaintext
From 6a40dc492678b35915adba8bfbd25648d9cc22ce 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.50.1
|
|
|
|
|
|
From aba27286e17c335ddc3040021cb500bfdb7c1d1e 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 2f67fd5..568563b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -3179,7 +3179,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.50.1
|
|
|
|
|
|
From 3c7feacc8b56d5f3256c3f8a9fc6a71182cee5f0 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 568563b..1ff7374 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -664,8 +664,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.50.1
|
|
|
|
|
|
From c7c9c383a80fbdf48090087435950f87da515df0 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 1ff7374..523d39f 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.50.1
|
|
|
|
|
|
From 63b1fbf06193f0ced80efb1d8cb5270a84ebe285 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 523d39f..5a58ce8 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.50.1
|
|
|
|
|
|
From 333d0b6368a7ffe77e1d27e4fde3c14ac70e0005 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.50.1
|
|
|
|
|
|
From 99ddad4bbdfffe78fb320c6cd42fbfa3ffb9845e 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.50.1
|
|
|