From fc08a7e361ffa08627544ab7498490b9a29faacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 27 May 2019 13:08:57 +0200 Subject: [PATCH] openimageio: fix cross ppc{,-musl} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/openimageio/template | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template index 9c09783c911..9362e49a0aa 100644 --- a/srcpkgs/openimageio/template +++ b/srcpkgs/openimageio/template @@ -21,21 +21,24 @@ checksum=a019086c05a6150d445a2240bab1723dff540dde5f5c327c36a97f0b5ae0e157 CXXFLAGS="-faligned-new" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) configure_args+=" -DUSE_SIMD=sse2" ;; - armv[56]*|mips*) makedepends+=" libatomic-devel" ;; + armv[56]*|mips*|ppc|ppc-musl) makedepends+=" libatomic-devel" ;; esac +if [ "$CROSS_BUILD" ]; then + configure_args+=" -DUSE_STD_REGEX_EXITCODE=0 -DUSE_STD_REGEX_EXITCODE__TRYRUN_OUTPUT=0" +fi pre_build() { local f # Replace -isystem with -I to avoid "#include_next " file not found - sed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" + vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g" case "$XBPS_TARGET_MACHINE" in - armv[56]*|mips*) + armv[56]*|mips*|ppc|ppc-musl) # Add libatomic to the targets - sed -i src/libOpenImageIO/CMakeLists.txt \ + vsed -i src/libOpenImageIO/CMakeLists.txt \ -e "s;^\(target_link_libraries (OpenImageIO ${ZLIB_LIBRARIES}\));\1 atomic);" for f in idiff igrep iconvert iinfo maketx testtex oiiotool; do - sed -i src/${f}/CMakeLists.txt \ + vsed -i src/${f}/CMakeLists.txt \ -e "s;^\(target_link_libraries .*\));\1 atomic);" done ;;