mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 00:00:07 +02:00
47 lines
1.3 KiB
Plaintext
47 lines
1.3 KiB
Plaintext
From 476a63ad1478ae24038f38edf61ef26c18a9c5f9 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 f48c726..4a59ff9 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.19.1
|
|
|
|
|
|
From 0e065ed8df55ba2742d6567f8e4148edf0f17bea 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 8ecaccc..c52a2c3 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2396,7 +2396,7 @@ else
|
|
DLL_EXT=".dll"
|
|
SO_LIB_VERSION_SEPARATOR="-"
|
|
;;
|
|
- *BSD)
|
|
+ *BSD|Haiku*)
|
|
DYNAMIC_CFLAGS="-fPIC"
|
|
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.19.1
|
|
|