mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 08:40:06 +02:00
169 lines
5.8 KiB
Plaintext
169 lines
5.8 KiB
Plaintext
From 98f5dcd5f2dba828f545dac2a534c90d0c5e6c53 Mon Sep 17 00:00:00 2001
|
|
From: korli <jerome.duval@gmail.com>
|
|
Date: Wed, 14 Mar 2012 00:15:38 +0000
|
|
Subject: patch for 1.0.0
|
|
|
|
|
|
diff --git a/build/make/configure.sh b/build/make/configure.sh
|
|
index cbf000b..4222e52 100755
|
|
--- a/build/make/configure.sh
|
|
+++ b/build/make/configure.sh
|
|
@@ -579,6 +579,9 @@ process_common_toolchain() {
|
|
*solaris2.10)
|
|
tgt_os=solaris
|
|
;;
|
|
+ *haiku*)
|
|
+ tgt_os=haiku
|
|
+ ;;
|
|
esac
|
|
|
|
if [ -n "$tgt_isa" ] && [ -n "$tgt_os" ]; then
|
|
@@ -909,8 +912,8 @@ process_common_toolchain() {
|
|
esac
|
|
;;
|
|
gcc*)
|
|
- add_cflags -m${bits}
|
|
- add_ldflags -m${bits}
|
|
+ enabled haiku || add_cflags -m${bits}
|
|
+ enabled haiku || add_ldflags -m${bits}
|
|
link_with_cc=gcc
|
|
tune_cflags="-march="
|
|
setup_gnu_toolchain
|
|
@@ -939,7 +942,7 @@ process_common_toolchain() {
|
|
add_asflags -f x64
|
|
enabled debug && add_asflags -g cv8
|
|
;;
|
|
- linux*|solaris*)
|
|
+ linux*|solaris*|haiku*)
|
|
add_asflags -f elf${bits}
|
|
enabled debug && [ "${AS}" = yasm ] && add_asflags -g dwarf2
|
|
enabled debug && [ "${AS}" = nasm ] && add_asflags -g
|
|
@@ -1019,6 +1022,7 @@ EOF
|
|
case ${toolchain} in
|
|
*-win*);;
|
|
*-android-gcc);;
|
|
+ *-haiku*);;
|
|
*) check_header pthread.h && add_extralibs -lpthread
|
|
esac
|
|
fi
|
|
diff --git a/configure b/configure
|
|
index 6195b2d..eb8a359 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -107,6 +107,7 @@ all_platforms="${all_platforms} x86-darwin8-icc"
|
|
all_platforms="${all_platforms} x86-darwin9-gcc"
|
|
all_platforms="${all_platforms} x86-darwin9-icc"
|
|
all_platforms="${all_platforms} x86-darwin10-gcc"
|
|
+all_platforms="${all_platforms} x86-haiku-gcc"
|
|
all_platforms="${all_platforms} x86-linux-gcc"
|
|
all_platforms="${all_platforms} x86-linux-icc"
|
|
all_platforms="${all_platforms} x86-solaris-gcc"
|
|
diff --git a/examples.mk b/examples.mk
|
|
index f6c9045..ab9657f 100644
|
|
--- a/examples.mk
|
|
+++ b/examples.mk
|
|
@@ -113,7 +113,9 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding
|
|
# We should not link to math library (libm) on RVCT
|
|
# when building for bare-metal targets
|
|
ifeq ($(CONFIG_OS_SUPPORT), yes)
|
|
-CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
|
|
+ ifneq ($(TOOLCHAIN),x86-haiku-gcc)
|
|
+ CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
|
|
+ endif
|
|
else
|
|
ifeq ($(CONFIG_GCC), yes)
|
|
CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 9a194ee7b8498467e5700e2c4e39bc6a30c95714 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Tue, 11 Jun 2013 21:09:11 +0200
|
|
Subject: configure: enable shared library building for Haiku
|
|
|
|
|
|
diff --git a/configure b/configure
|
|
index eb8a359..a2ef98d 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -438,7 +438,7 @@ process_detect() {
|
|
# Can only build shared libs on a subset of platforms. Doing this check
|
|
# here rather than at option parse time because the target auto-detect
|
|
# magic happens after the command line has been parsed.
|
|
- enabled linux || die "--enable-shared only supported on ELF for now"
|
|
+ enabled linux || enabled haiku || die "--enable-shared only supported on ELF for now"
|
|
fi
|
|
if [ -z "$CC" ]; then
|
|
echo "Bypassing toolchain for environment detection."
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 238a1625cbbb75a1a84c112bacd3e6afee54a919 Mon Sep 17 00:00:00 2001
|
|
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
|
Date: Tue, 11 Jun 2013 21:09:28 +0200
|
|
Subject: libs.mk: no -lm or -lpthread on Haiku
|
|
|
|
|
|
diff --git a/libs.mk b/libs.mk
|
|
index 79a1d00..d88cfa7 100644
|
|
--- a/libs.mk
|
|
+++ b/libs.mk
|
|
@@ -196,7 +196,6 @@ LIBVPX_SO := libvpx.so.$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION
|
|
LIBS-$(BUILD_LIBVPX_SO) += $(BUILD_PFX)$(LIBVPX_SO)\
|
|
$(notdir $(LIBVPX_SO_SYMLINKS))
|
|
$(BUILD_PFX)$(LIBVPX_SO): $(LIBVPX_OBJS) libvpx.ver
|
|
-$(BUILD_PFX)$(LIBVPX_SO): extralibs += -lm
|
|
$(BUILD_PFX)$(LIBVPX_SO): SONAME = libvpx.so.$(VERSION_MAJOR)
|
|
$(BUILD_PFX)$(LIBVPX_SO): SO_VERSION_SCRIPT = libvpx.ver
|
|
LIBVPX_SO_SYMLINKS := $(addprefix $(LIBSUBDIR)/, \
|
|
@@ -398,7 +397,7 @@ $(foreach bin,$(LIBVPX_TEST_BINS),\
|
|
$(if $(BUILD_LIBVPX),$(eval $(bin): libvpx.a libgtest.a ))\
|
|
$(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\
|
|
$(bin).cc.o \
|
|
- -L. -lvpx -lgtest -lpthread -lm)\
|
|
+ -L. -lvpx -lgtest)\
|
|
)))\
|
|
$(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\
|
|
|
|
--
|
|
1.8.3.4
|
|
|
|
|
|
From 214d6e14250d72980faf3798501efe5808562854 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
|
|
Date: Tue, 3 Dec 2013 22:18:36 +0000
|
|
Subject: x86_64 support
|
|
|
|
* configure, amples.mk
|
|
|
|
diff --git a/configure b/configure
|
|
index a2ef98d..4b671ee 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -118,6 +118,7 @@ all_platforms="${all_platforms} x86-win32-vs9"
|
|
all_platforms="${all_platforms} x86_64-darwin9-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin10-gcc"
|
|
all_platforms="${all_platforms} x86_64-darwin11-gcc"
|
|
+all_platforms="${all_platforms} x86_64-haiku-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-gcc"
|
|
all_platforms="${all_platforms} x86_64-linux-icc"
|
|
all_platforms="${all_platforms} x86_64-solaris-gcc"
|
|
diff --git a/examples.mk b/examples.mk
|
|
index ab9657f..947a645 100644
|
|
--- a/examples.mk
|
|
+++ b/examples.mk
|
|
@@ -113,7 +113,7 @@ vp8_multi_resolution_encoder.DESCRIPTION = VP8 Multiple-resolution Encoding
|
|
# We should not link to math library (libm) on RVCT
|
|
# when building for bare-metal targets
|
|
ifeq ($(CONFIG_OS_SUPPORT), yes)
|
|
- ifneq ($(TOOLCHAIN),x86-haiku-gcc)
|
|
+ ifeq (,$(findstring haiku,$(TOOLCHAIN)))
|
|
CODEC_EXTRA_LIBS-$(CONFIG_VP8) += m
|
|
endif
|
|
else
|
|
--
|
|
1.8.3.4
|
|
|