im: allow hybrid builds and other cleanups

* Fix tecmake to set a soname for the libraries

This currenly fails strict-policy checks because the package doesn't
depend on libstdc++.so, but this should be in haiku$secondaryArchSuffix.
I also had to explicitly depend on the proper version of as, otherwise
the one for gcc2 would be picked up. I suspect one of the dependencies
is wrong, but attempts to use haikuporter --why have failed.
This commit is contained in:
Adrien Destugues
2013-11-16 21:51:21 +01:00
parent 62984b532f
commit ac009bccc0
2 changed files with 29 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
From 6421d3e8c775ddb4477f4418a983d5bfa2b901f0 Mon Sep 17 00:00:00 2001
From 8fa357e184a5b8892e9355a85368803dde4f7d01 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 14 Nov 2013 21:46:53 +0100
Subject: Make tecmake aware of Haiku and the lack of libm.
@@ -21,7 +21,7 @@ index cc89349..fc982e0 100755
}
diff --git a/tecmake.mak b/tecmake.mak
index f799a07..7ee8895 100755
index f799a07..c955869 100755
--- a/tecmake.mak
+++ b/tecmake.mak
@@ -26,6 +26,9 @@ ifndef TEC_UNAME
@@ -34,7 +34,19 @@ index f799a07..7ee8895 100755
ifeq ($(TEC_SYSNAME), SunOS)
TEC_SYSARCH:=$(shell uname -p)
endif
@@ -1177,7 +1180,9 @@ ifdef USE_X11
@@ -526,6 +529,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
@@ -1177,7 +1185,9 @@ ifdef USE_X11
STDINCS += $(X11_INC)
endif