mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
78 lines
1.8 KiB
Plaintext
78 lines
1.8 KiB
Plaintext
From 159b056fff20def9a468febe7afe7b3866ca21ee Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Wed, 26 Dec 2018 14:18:48 +0100
|
|
Subject: Add soname for libraries on Haiku
|
|
|
|
|
|
diff --git a/tecmake.mak b/tecmake.mak
|
|
index 524b7ec..7e43056 100755
|
|
--- a/tecmake.mak
|
|
+++ b/tecmake.mak
|
|
@@ -653,6 +653,11 @@ ifneq ($(findstring CentOS, $(TEC_UNAME)), )
|
|
endif
|
|
endif
|
|
|
|
+ifneq ($(findstring Haiku, $(TEC_UNAME)), )
|
|
+ UNIX_POSIX = Yes
|
|
+ STDLDFLAGS := -shared -Wl,-soname=lib$(TARGETNAME).so
|
|
+endif
|
|
+
|
|
ifneq ($(findstring IRIX, $(TEC_UNAME)), )
|
|
UNIX_POSIX = Yes
|
|
ifndef NO_LOCAL_LD
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 8fc44515cfe06206c3afb52f150be56428dcd291 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Wed, 26 Dec 2018 14:46:21 +0100
|
|
Subject: Avoid types conflicts in libjasper
|
|
|
|
|
|
diff --git a/src/im_jp2.mak b/src/im_jp2.mak
|
|
index 49daa8e..50ce27b 100755
|
|
--- a/src/im_jp2.mak
|
|
+++ b/src/im_jp2.mak
|
|
@@ -44,6 +44,10 @@ else
|
|
DEFINES += HAVE_UNISTD_H JAS_TYPES
|
|
endif
|
|
|
|
+ifneq ($(findstring Haiku, $(TEC_UNAME)), )
|
|
+ DEFINES += HAVE_STDINT_H
|
|
+endif
|
|
+
|
|
ifneq ($(findstring MacOS, $(TEC_UNAME)), )
|
|
ifneq ($(TEC_SYSMINOR), 4)
|
|
BUILD_DYLIB=Yes
|
|
--
|
|
2.19.1
|
|
|
|
|
|
From 4b957c7ef9366ca29bfaccfecfe65f62f18e602b Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Wed, 13 Feb 2019 11:32:20 +0100
|
|
Subject: Fix Lua search path for Haiku
|
|
|
|
|
|
diff --git a/tecmake.mak b/tecmake.mak
|
|
index 7e43056..f8cce1a 100755
|
|
--- a/tecmake.mak
|
|
+++ b/tecmake.mak
|
|
@@ -1048,7 +1048,11 @@ ifdef USE_LUA
|
|
endif
|
|
endif
|
|
|
|
- LUA_INC ?= $(LUA)/include
|
|
+ ifneq ($(findstring Haiku, $(TEC_UNAME)), )
|
|
+ LUA_INC ?= $(shell pkg-config --cflags-only-I lua | cut -b 3-)
|
|
+ else
|
|
+ LUA_INC ?= $(LUA)/include
|
|
+ endif
|
|
INCLUDES += $(LUA_INC)
|
|
|
|
LUA_BIN ?= $(LUA)/bin/$(TEC_UNAME)
|
|
--
|
|
2.19.1
|
|
|