mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
67 lines
2.0 KiB
Plaintext
67 lines
2.0 KiB
Plaintext
From 9d46b34056b2deae1c541431fa70808af18e65e0 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sat, 30 Sep 2017 13:03:23 +0000
|
|
Subject: Hack in Haiku support
|
|
|
|
|
|
diff --git a/src/engine/Jambase b/src/engine/Jambase
|
|
index 385c6f3..b7d0c1a 100644
|
|
--- a/src/engine/Jambase
|
|
+++ b/src/engine/Jambase
|
|
@@ -51,7 +51,7 @@ BOOST_BUILD_PATH.user-value = $(BOOST_BUILD_PATH) ;
|
|
# Policy.
|
|
if ! $(BOOST_BUILD_PATH) && $(UNIX)
|
|
{
|
|
- BOOST_BUILD_PATH = /usr/share/boost-build ;
|
|
+ BOOST_BUILD_PATH = /system/data/boost-build ;
|
|
}
|
|
|
|
|
|
diff --git a/src/engine/build.jam b/src/engine/build.jam
|
|
index de567dd..9ef355a 100644
|
|
--- a/src/engine/build.jam
|
|
+++ b/src/engine/build.jam
|
|
@@ -220,7 +220,7 @@ toolset gcc gcc : "-o " : -D
|
|
[ opt --debug : -g -O0 -fno-inline ]
|
|
[ opt --profile : -O3 -g -pg ]
|
|
-I$(--python-include) -I$(--extra-include) -Wno-long-long
|
|
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
|
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) -lbsd ;
|
|
## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
|
|
toolset gcc-nocygwin gcc : "-o " : -D
|
|
: -s -O3 -mno-cygwin
|
|
diff --git a/src/engine/build.sh b/src/engine/build.sh
|
|
index 005e4d9..27df891 100755
|
|
--- a/src/engine/build.sh
|
|
+++ b/src/engine/build.sh
|
|
@@ -156,6 +156,13 @@ case $BOOST_JAM_TOOLSET in
|
|
BOOST_JAM_OS="NT"
|
|
;;
|
|
|
|
+ *haiku*)
|
|
+ BOOST_JAM_CC=gcc
|
|
+ BOOST_JAM_OPT_JAM="$BOOST_JAM_OPT_JAM $CFLAGS -lbsd"
|
|
+ BOOST_JAM_OPT_MKJAMBASE="$BOOST_JAM_OPT_MKJAMBASE $CFLAGS -lbsd"
|
|
+ BOOST_JAM_OPT_YYACC="$BOOST_JAM_OPT_YYACC $CFLAGS -lbsd"
|
|
+ ;;
|
|
+
|
|
*)
|
|
BOOST_JAM_CC=gcc
|
|
esac
|
|
diff --git a/src/engine/jambase.c b/src/engine/jambase.c
|
|
index 436c683..5c16716 100644
|
|
--- a/src/engine/jambase.c
|
|
+++ b/src/engine/jambase.c
|
|
@@ -30,7 +30,7 @@ char *jambase[] = {
|
|
"\n",
|
|
"if ! $(BOOST_BUILD_PATH) && $(UNIX)\n",
|
|
"{\n",
|
|
-"BOOST_BUILD_PATH = /usr/share/boost-build ;\n",
|
|
+"BOOST_BUILD_PATH = /system/data/boost-build ;\n",
|
|
"}\n",
|
|
"\n",
|
|
"\n",
|
|
--
|
|
2.37.3
|
|
|