ixion: bump version

This commit is contained in:
Kacper Kasper
2018-09-01 15:32:22 +02:00
parent a4fe5c142b
commit df74577535
2 changed files with 43 additions and 10 deletions

View File

@@ -10,30 +10,37 @@ and a partial calculation of only the affected cells need to be calculated."
HOMEPAGE="https://gitlab.com/ixion/ixion"
COPYRIGHT="Kohei Yoshida et al."
LICENSE="MPL v2.0"
REVISION="2"
REVISION="1"
SOURCE_URI="http://kohei.us/files/ixion/src/libixion-$portVersion.tar.gz"
CHECKSUM_SHA256="f990c18354a5aaa7e2a99a38c44f37f8169aa86a54bf285be26e21453fae3b8b"
CHECKSUM_SHA256="5f646dd5089700093be157ff71698e276df9512afb4806954094a936f80ca9d1"
SOURCE_DIR="libixion-$portVersion"
PATCHES="ixion-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
boostMinimumVersion=1.65.0
soVersion="${portVersion%.*}"
PROVIDES="
ixion$secondaryArchSuffix = $portVersion
cmd:ixion_formula_tokenizer$secondaryArchSuffix = $portVersion
cmd:ixion_parser$secondaryArchSuffix = $portVersion
cmd:ixion_sorter$secondaryArchSuffix = $portVersion
lib:libixion_0.13$secondaryArchSuffix = 13.0.0 compat >= 13
lib:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_program_options$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
lib:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion
lib:libboost_system$secondaryArchSuffix >= $boostMinimumVersion
lib:libz$secondaryArchSuffix
"
PROVIDES_devel="
ixion${secondaryArchSuffix}_devel = $portVersion
devel:libixion_0.13$secondaryArchSuffix = 13.0.1 compat >= 13
devel:libixion_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0
"
REQUIRES_devel="
ixion$secondaryArchSuffix == $portVersion base
@@ -41,9 +48,11 @@ REQUIRES_devel="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libboost_program_options$secondaryArchSuffix
devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion
devel:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion
devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion
devel:libz$secondaryArchSuffix
devel:mdds >= 1.2
devel:mdds >= 1.4
"
BUILD_PREREQUIRES="
cmd:aclocal
@@ -60,7 +69,7 @@ defineDebugInfoPackage ixion$secondaryArchSuffix \
$binDir/ixion-formula-tokenizer \
$binDir/ixion-parser \
$binDir/ixion-sorter \
$libDir/libixion-0.13.so.0.0.0
$libDir/libixion-$soVersion.so.0.0.0
PATCH()
{
@@ -80,9 +89,9 @@ INSTALL()
{
make install
rm $libDir/libixion-0.13.la
rm $libDir/libixion-$soVersion.la
prepareInstalledDevelLibs libixion-0.13
prepareInstalledDevelLibs libixion-$soVersion
fixPkgconfig
packageEntries devel \

View File

@@ -0,0 +1,24 @@
From 52e55962498093559a0d35b282ac00894f0078be Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 1 Sep 2018 15:26:19 +0200
Subject: Fix Haiku build
diff --git a/configure.ac b/configure.ac
index 388f85a..1296498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,10 @@ case $host_os in
_os=Darwin
LDFLAGS="$LDFLAGS -L/usr/local/lib"
;;
+ haiku*)
+ _os=Haiku
+ LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
+ ;;
*)
_os=
LDFLAGS="$LDFLAGS -Wl,--no-as-needed -pthread -ldl"
--
2.16.4