haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

cd,iup: support hybrid builds

Browse Source 
* Untested, as IM fails to build for a non-identified reason.
This commit is contained in:
Adrien Destugues
2013-11-16 21:56:09 +01:00
parent ac009bccc0
commit 6fb6ba0f93
4 changed files with 222 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
x11-libs/cd/patches/cd-5.6.patchset
View File

@@ -1,4 +1,4 @@
From 49ce8054eee01b9a146ff7a7ee77303b7834b2a5 Mon Sep 17 00:00:00 2001
From 684d70f2ff902351dfa75f81111dffeb7eb67eb3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 15 Nov 2013 21:59:25 +0100
Subject: Import Haiku port sources.
@@ -688,7 +688,7 @@ index cc89349..fc982e0 100644
}
diff --git a/tecmake.mak b/tecmake.mak
index e5f5efd..6463f3c 100644
index e5f5efd..d52f725 100644
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -6,7 +6,7 @@
@@ -722,7 +722,19 @@ index e5f5efd..6463f3c 100644
ifneq ($(findstring Linux, $(TEC_UNAME)), )
UNIX_LINUX = Yes
ifdef BUILD_64
@@ -852,6 +860,7 @@ endif
@@ -526,6 +534,11 @@ ifneq ($(findstring Linux, $(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
@@ -852,6 +865,7 @@ endif
ifdef USE_IUP
IUP_SUFFIX ?=
ifdef USE_IUP3
@@ -730,7 +742,7 @@ index e5f5efd..6463f3c 100644
ifdef GTK_DEFAULT
ifdef USE_MOTIF
IUP_SUFFIX := mot
@@ -869,6 +878,7 @@ ifdef USE_IUP
@@ -869,6 +883,7 @@ ifdef USE_IUP
endif
endif
endif
@@ -738,7 +750,7 @@ index e5f5efd..6463f3c 100644
else
ifndef NO_OVERRIDE
override USE_MOTIF = Yes
@@ -902,17 +912,21 @@ endif
@@ -902,17 +917,21 @@ endif
ifdef USE_CD
CD_SUFFIX ?=
@@ -771,7 +783,7 @@ index e5f5efd..6463f3c 100644
endif
endif
endif
@@ -993,7 +1007,6 @@ endif
@@ -993,7 +1012,6 @@ endif
ifdef LINK_FREETYPE
FREETYPE = freetype
ifneq ($(findstring cygw, $(TEC_UNAME)), )
@@ -779,7 +791,7 @@ index e5f5efd..6463f3c 100644
FREETYPE = freetype-6
endif
@@ -1138,23 +1151,21 @@ ifdef USE_GTK
@@ -1138,23 +1156,21 @@ ifdef USE_GTK
ifndef USE_GTK3
STDINCS += $(GTK)/lib/x86_64-linux-gnu/gtk-2.0/include
endif
@@ -818,7 +830,7 @@ index e5f5efd..6463f3c 100644
endif
endif
@@ -1180,7 +1191,9 @@ ifdef USE_X11
@@ -1180,7 +1196,9 @@ ifdef USE_X11
STDINCS += $(X11_INC)
endif