gcc5: fix provides.

* patches libgcc to add haiku x86 and x86_64 as soft-fp targets.
This commit is contained in:
Jerome Duval
2015-12-13 10:46:20 +00:00
parent 30fd8d6335
commit bdbea06c7d
2 changed files with 32 additions and 7 deletions

View File

@@ -108,7 +108,7 @@ BUILD()
--enable-languages=c,c++ --enable-lto --enable-frame-pointer \
--with-pkgversion=$(echo $portVersion | cut -d_ -f2-) \
--enable-__cxa-atexit --with-system-zlib --enable-checking=release \
--enable-libmpx --with-bug-url=http://dev.haiku-os.org/ \
--with-bug-url=http://dev.haiku-os.org/ \
--with-default-libstdcxx-abi=gcc4-compatible \
$additionalConfigureFlags
@@ -304,10 +304,10 @@ distribution. This package contains the shared libraries for the runtime \
loader, so it is required for executing most c/c++ programs."
PROVIDES_syslibs="
gcc5_syslibs$secondaryArchSuffix = $portVersion compat >= 5
lib:libgcc_s$secondaryArchSuffix = $portVersion compat >= 5
lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 5
lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 5
gcc5_syslibs$secondaryArchSuffix = $portVersion compat >= 4
lib:libgcc_s$secondaryArchSuffix = $portVersion compat >= 4
lib:libstdc++$secondaryArchSuffix = $portVersion compat >= 4
lib:libsupc++$secondaryArchSuffix = $portVersion compat >= 4
"
REQUIRES_syslibs="
haiku$secondaryArchSuffix

View File

@@ -1,4 +1,4 @@
From 18be3dba1a411f89852001808207fecef6867e61 Mon Sep 17 00:00:00 2001
From c8a741cf5cbc7ad935e389c5a957a739245358f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Sun, 19 Jul 2015 18:55:34 +0200
Subject: Haiku patch
@@ -2323,7 +2323,7 @@ index 24d13f3..94d96d9 100644
2.2.2
From f5bf635b4e427bc0db47500bace4d6154c67f61f Mon Sep 17 00:00:00 2001
From 86053f9a13d76e1e910648a9ec6a70fc30922f4b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 10 Dec 2015 22:07:03 +0000
Subject: Haiku: regenerate configure.
@@ -2843,3 +2843,28 @@ index 8cd4c76..d12f460 100755
--
2.2.2
From 37b7a7a055c1b6a83c920403df101a205b617794 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 12 Dec 2015 09:55:48 +0000
Subject: config.host (i[34567]86-*-haiku* and x86_64-*-haiku*):
Add to lists of i[34567]86-*-* and x86_64-*-* soft-fp targets.
diff --git a/libgcc/config.host b/libgcc/config.host
index dc73f2a..32e3cd2 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1356,7 +1356,8 @@ i[34567]86-*-darwin* | x86_64-*-darwin* | \
i[34567]86-*-mingw* | x86_64-*-mingw* | \
i[34567]86-*-dragonfly* | x86_64-*-dragonfly* | \
i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
- i[34567]86-*-openbsd* | x86_64-*-openbsd*)
+ i[34567]86-*-openbsd* | x86_64-*-openbsd* | \
+ i[34567]86-*-haiku* | x86_64-*-haiku*)
tmake_file="${tmake_file} t-softfp-tf"
if test "${host_address}" = 32; then
tmake_file="${tmake_file} i386/${host_address}/t-softfp"
--
2.2.2