PovRay: Build fix (#3907)

* Build fix

* More cleanup

* Buil fix
This commit is contained in:
miqlas
2019-06-06 22:36:52 +02:00
committed by GitHub
parent 1bd3333505
commit e3cf2dae6f

View File

@@ -32,7 +32,6 @@ REQUIRES="
lib:libHalf$secondaryArchSuffix
lib:libiex_2_2$secondaryArchSuffix
lib:libiexmath_2_2$secondaryArchSuffix
lib:libilmimf_2_2$secondaryArchSuffix
lib:libilmthread_2_2$secondaryArchSuffix
lib:libimath_2_2$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
@@ -41,6 +40,11 @@ REQUIRES="
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
REQUIRES+="
lib:libilmimf_2_2$secondaryArchSuffix
"
fi
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
@@ -49,7 +53,6 @@ BUILD_REQUIRES="
devel:libHalf$secondaryArchSuffix
devel:libiex_2_2$secondaryArchSuffix
devel:libiexmath_2_2$secondaryArchSuffix
devel:libilmimf_2_2$secondaryArchSuffix
devel:libilmthread_2_2$secondaryArchSuffix
devel:libimath_2_2$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
@@ -58,6 +61,11 @@ BUILD_REQUIRES="
devel:libtiff$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
BUILD_REQUIRES+="
devel:libilmimf_2_2$secondaryArchSuffix
"
fi
BUILD_PREREQUIRES="
cmd:autoconf
cmd:automake
@@ -75,23 +83,21 @@ BUILD_PREREQUIRES="
BUILD()
{
cd unix
pushd unix
./prebuild.sh
autoupdate
cd ..
export LDFLAGS="-lbsd -lnetwork"
export CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR -D_BSD_SOURCE"
KeepEXR=""
popd
if [ $effectiveTargetArchitecture = x86_gcc2 ]; then
KeepEXR="--without-openexr"
fi
LDFLAGS="-lbsd -lnetwork -lboost_date_time" \
CXXFLAGS="-std=c++11 -DBOOST_NO_CXX11_CONSTEXPR -D_BSD_SOURCE" \
runConfigure ./configure \
COMPILED_BY="HaikuPorts" \
--disable-optimiz \
--with-boost-libdir="$libDir/${secondaryArchSubDir}" \
--with-boost-libdir="$portPackageLinksDir/devel~libboost_system/$relativeLibDir/" \
$KeepEXR
make $jobArgs