Fixes for fftw, tiff and vigra.

* tiff can build on gcc2 now.
* Move vigra-config script to devel package.
* Fix policy violations.
This commit is contained in:
Kacper Kasper
2014-04-30 01:38:16 +02:00
parent 92edcf4217
commit dea6d55cdc
3 changed files with 26 additions and 16 deletions

View File

@@ -12,15 +12,12 @@ LICENSE="MIT"
COPYRIGHT="1988-1997 Sam Leffler
1991-1997 Silicon Graphics, Inc."
REVISION="2"
ARCHITECTURES="x86 ?x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86"
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
tiff$secondaryArchSuffix = $portVersion
tiff$secondaryArchSuffix = $portVersion compat >= 4
lib:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
lib:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
"
@@ -46,6 +43,14 @@ BUILD_PREREQUIRES="
cmd:make
"
PATCH()
{
if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
sed -i 's/ios::pos_type/streampos/g' libtiff/tif_stream.cxx
sed -i 's/ios::off_type/streamoff/g' libtiff/tif_stream.cxx
fi
}
BUILD()
{
aclocal
@@ -86,7 +91,7 @@ INSTALL()
# ----- devel package -------------------------------------------------------
PROVIDES_devel="
tiff${secondaryArchSuffix}_devel = $portVersion
tiff${secondaryArchSuffix}_devel = $portVersion compat >= 4
devel:libtiff$secondaryArchSuffix = 5.1.0 compat >= 5
devel:libtiffxx$secondaryArchSuffix = 5.1.0 compat >= 5
"
@@ -127,5 +132,7 @@ if [ -z "$secondaryArchSuffix" ]; then
REQUIRES_tools="
haiku >= $haikuVersion
tiff == $portVersion base
lib:libjpeg
lib:libz
"
fi