mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
142 lines
3.1 KiB
Plaintext
142 lines
3.1 KiB
Plaintext
From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd 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 782e6c0..669e52a 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 f204484..5cb10ee 100644
|
|
--- a/lib/dbm/include/mcom_db.h
|
|
+++ b/lib/dbm/include/mcom_db.h
|
|
@@ -66,7 +66,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
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From a90f08ec358c67555eced1750db584e1dfcc9381 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 1de9b49..08d7753 100644
|
|
--- a/lib/freebl/stubs.c
|
|
+++ b/lib/freebl/stubs.c
|
|
@@ -594,6 +594,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
|
|
*/
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 654a6b2ba7aabe42120b1477138bc357ddf9c98a 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
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 6ed942559c69cdfaa34a8dfe427b080e87512055 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
|
|
--
|
|
1.8.3.4
|
|
|