mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
Revert parts of d0ef852764.
This commit is contained in:
@@ -14,12 +14,16 @@ SRC_URI="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$portVersi
|
||||
CHECKSUM_SHA256="ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7"
|
||||
REVISION="1"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||
|
||||
if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
|
||||
PATCHES="ilmbase-$portVersion.patchset"
|
||||
ARCHITECTURES="x86 x86_64"
|
||||
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
|
||||
# x86_gcc2 is fine as primary target architecture as long as we're building
|
||||
# for a different secondary architecture.
|
||||
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
|
||||
else
|
||||
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
|
||||
fi
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
ilmbase$secondaryArchSuffix = $portVersion
|
||||
lib:libHalf$secondaryArchSuffix = 12.0.0 compat >= 12
|
||||
@@ -31,6 +35,7 @@ PROVIDES="
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix >= $haikuVersion
|
||||
lib:libstdc++$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel >= $haikuVersion
|
||||
@@ -48,9 +53,6 @@ BUILD_PREREQUIRES="
|
||||
BUILD()
|
||||
{
|
||||
./bootstrap
|
||||
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
|
||||
export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
|
||||
fi
|
||||
runConfigure ./configure
|
||||
make
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user