haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert parts of d0ef852764.

Browse Source
This commit is contained in:
Jerome Duval
2014-09-22 22:30:13 +00:00
parent d0ef852764
commit 0796b881e4
10 changed files with 134 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media-libs/ilmbase/ilmbase-2.2.0.recipe
View File

@@ -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
}

9
media-libs/openexr/openexr-2.2.0.recipe
View File

@@ -21,11 +21,9 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
PATCHES="openexr-$portVersion.patchset"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
openexr$secondaryArchSuffix = $portVersion
@@ -83,9 +81,6 @@ ${pathSecondaryArchSuffix}/pkgconfig/IlmBase.pc | sed s/IlmBase\.pc//g)
export PKG_CONFIG_PATH+=:$IlmBasePkgconfig
./bootstrap
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
export CPPFLAGS="-Dios_base=ios -ftemplate-depth-24"
fi
runConfigure ./configure
make $jobArgs
}