mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
161 lines
3.5 KiB
Plaintext
161 lines
3.5 KiB
Plaintext
From a05105e8cf826330b1de3e2f33150c0283c934bd Mon Sep 17 00:00:00 2001
|
|
From: Kacper Kasper <kacperkasper@gmail.com>
|
|
Date: Sat, 5 Jul 2014 02:12:23 +0200
|
|
Subject: Haiku support
|
|
|
|
|
|
diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk
|
|
index 750696d..b53cfea 100644
|
|
--- a/coreconf/BeOS.mk
|
|
+++ b/coreconf/BeOS.mk
|
|
@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk
|
|
|
|
XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS)
|
|
|
|
-USE_PTHREADS =
|
|
+USE_PTHREADS = 1
|
|
|
|
ifeq ($(USE_PTHREADS),1)
|
|
IMPL_STRATEGY = _PTH
|
|
@@ -27,7 +27,7 @@ else
|
|
CPU_ARCH = x86
|
|
endif
|
|
|
|
-MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
|
|
+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
|
|
ifdef BUILD_OPT
|
|
OPTIMIZER = -O2
|
|
endif
|
|
diff --git a/coreconf/arch.mk b/coreconf/arch.mk
|
|
index 62ba8d5..d515a20 100644
|
|
--- a/coreconf/arch.mk
|
|
+++ b/coreconf/arch.mk
|
|
@@ -41,6 +41,14 @@ else
|
|
endif
|
|
|
|
#
|
|
+# Force the Haiku machines to use BeOS.
|
|
+#
|
|
+
|
|
+ifeq ($(OS_ARCH),Haiku)
|
|
+ OS_ARCH = BeOS
|
|
+endif
|
|
+
|
|
+#
|
|
# Force the IRIX64 machines to use IRIX.
|
|
#
|
|
|
|
diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h
|
|
index 4cca532..ecec75d 100644
|
|
--- a/lib/dbm/include/mcom_db.h
|
|
+++ b/lib/dbm/include/mcom_db.h
|
|
@@ -60,7 +60,7 @@ typedef PRUint32 uint32;
|
|
#include <sys/byteorder.h>
|
|
#endif
|
|
|
|
-#if defined(__linux) || defined(__BEOS__)
|
|
+#if defined(__linux) || defined(BEOS)
|
|
#include <endian.h>
|
|
#ifndef BYTE_ORDER
|
|
#define BYTE_ORDER __BYTE_ORDER
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 155512db961560ecaa31781efc1a4e8e56673d51 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 25 Sep 2014 13:09:35 +0000
|
|
Subject: define RTLD_NOLOAD
|
|
|
|
|
|
diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c
|
|
index 993d01e..b436dd2 100644
|
|
--- a/lib/freebl/stubs.c
|
|
+++ b/lib/freebl/stubs.c
|
|
@@ -596,6 +596,10 @@ freebl_InitNSSUtil(void *lib)
|
|
return SECSuccess;
|
|
}
|
|
|
|
+#ifndef RTLD_NOLOAD
|
|
+ #define RTLD_NOLOAD 0
|
|
+#endif
|
|
+
|
|
/*
|
|
* fetch the library if it's loaded. For NSS it should already be loaded
|
|
*/
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 107d6928d8f969d28a7341bb500268d15fa7ebe1 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 25 Sep 2014 13:40:13 +0000
|
|
Subject: skip optionally the signing part
|
|
|
|
|
|
diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile
|
|
index 83f90fa..8934439 100644
|
|
--- a/cmd/shlibsign/Makefile
|
|
+++ b/cmd/shlibsign/Makefile
|
|
@@ -95,5 +95,7 @@ else
|
|
endif
|
|
endif
|
|
|
|
+ifndef SKIP_SHLIBSIGN
|
|
libs install :: $(CHECKLOC)
|
|
+endif
|
|
|
|
diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk
|
|
index b53cfea..51fe162 100644
|
|
--- a/coreconf/BeOS.mk
|
|
+++ b/coreconf/BeOS.mk
|
|
@@ -45,3 +45,5 @@ ARCH = beos
|
|
|
|
DSO_CFLAGS = -fPIC
|
|
DSO_LDOPTS =
|
|
+
|
|
+SKIP_SHLIBSIGN=1
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 814cc5773310331615081ead443177f3085f6dd7 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Thu, 25 Sep 2014 14:14:26 +0000
|
|
Subject: use system libs
|
|
|
|
|
|
diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk
|
|
index 51fe162..fe54580 100644
|
|
--- a/coreconf/BeOS.mk
|
|
+++ b/coreconf/BeOS.mk
|
|
@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC
|
|
DSO_LDOPTS =
|
|
|
|
SKIP_SHLIBSIGN=1
|
|
+USE_SYSTEM_ZLIB = 1
|
|
+ZLIB_LIBS = -lz
|
|
+NSS_USE_SYSTEM_SQLITE=1
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From 22dc826a0490c0fdb42e5ba69a56695d388a9e14 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 24 Nov 2015 19:12:08 +0000
|
|
Subject: avoid some tests.
|
|
|
|
|
|
diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk
|
|
index fe54580..3bc0ce3 100644
|
|
--- a/coreconf/BeOS.mk
|
|
+++ b/coreconf/BeOS.mk
|
|
@@ -50,3 +50,4 @@ SKIP_SHLIBSIGN=1
|
|
USE_SYSTEM_ZLIB = 1
|
|
ZLIB_LIBS = -lz
|
|
NSS_USE_SYSTEM_SQLITE=1
|
|
+NSS_DISABLE_GTESTS=1
|
|
--
|
|
2.2.2
|
|
|