DevIL: fix x86 build (#1685)

This commit is contained in:
Schrijvers Luc
2017-10-05 09:34:07 +02:00
committed by Jérôme Duval
parent 00c177ee85
commit ab33809f14

View File

@@ -9,13 +9,13 @@ filter and display a wide variety of image formats."
HOMEPAGE="http://openil.sourceforge.net/"
COPYRIGHT="2017 Denton Woods"
LICENSE="GNU LGPL v2.1"
REVISION="1"
REVISION="2"
SOURCE_URI="http://sourceforge.net/projects/openil/files/DevIL/$portVersion/DevIL-$portVersion.tar.gz"
CHECKSUM_SHA256="0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709"
SOURCE_DIR="DevIL"
ARCHITECTURES="?x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="?x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
devil$secondaryArchSuffix = $portVersion
@@ -71,9 +71,15 @@ BUILD()
mkdir -p haiku-build
cd haiku-build
if [ $targetArchitecture = x86_gcc2 ]; then
cmake .. \
-DCMAKE_INSTALL_PREFIX:PATH=$libDir \
-DCMAKE_CXX_FLAGS="-fpermissive"
else
cmake .. \
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
-DCMAKE_CXX_FLAGS="-fpermissive"
fi
make $jobArgs
}
@@ -83,13 +89,26 @@ INSTALL()
cd DevIL/haiku-build
make install
prepareInstalledDevelLib libIL
fixPkgconfig
if [ $targetArchitecture = x86_gcc2 ]; then
mkdir -p $libDir
mv $libDir/lib/* $libDir
rmdir $libDir/lib
mkdir -p $includeDir
mv $libDir/include/* $includeDir
rmdir $libDir/include
fi
if [ $targetArchitecture = x86_64 ]; then
mkdir -p $includeDir
mv $prefix/include/* $includeDir
rmdir $prefix/include
fi
packageEntries devel $developDir
prepareInstalledDevelLibs libIL libILU libILUT
fixPkgconfig
packageEntries devel \
$developDir
}
TEST()