diff options
| author | ryoon <ryoon@pkgsrc.org> | 2020-03-17 14:19:02 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2020-03-17 14:19:02 +0000 |
| commit | 845f7921281eff85d8d143736055906098ff2adc (patch) | |
| tree | a1afa2dfc0921596ee43d08b010d28c4e43a6fa0 /graphics/openimageio | |
| parent | 919ff7aba33c467409d676257a6bdd9951985c7b (diff) | |
| download | pkgsrc-845f7921281eff85d8d143736055906098ff2adc.tar.gz | |
openimageio: Fix POSIX shell portability issues in Makefile and alloca(3) use
* Bump PKGREVISION from use of alloca(3) supplied by copmpiler.
Diffstat (limited to 'graphics/openimageio')
| -rw-r--r-- | graphics/openimageio/Makefile | 7 | ||||
| -rw-r--r-- | graphics/openimageio/distinfo | 3 | ||||
| -rw-r--r-- | graphics/openimageio/patches/patch-Makefile | 18 |
3 files changed, 24 insertions, 4 deletions
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index d8ccd52a484..3b1776aaaa4 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.62 2020/03/10 22:08:51 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2020/03/17 14:19:02 ryoon Exp $ OIIOVER= 1.8.15 DISTNAME= oiio-Release-${OIIOVER} PKGNAME= ${DISTNAME:S/oiio-Release/openimageio/} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= graphics MASTER_SITES= -https://github.com/OpenImageIO/oiio/archive/Release-${OIIOVER}.tar.gz @@ -13,7 +13,8 @@ COMMENT= OpenImageIO is a library for reading and writing images LICENSE= modified-bsd USE_CMAKE= yes -USE_LANGUAGES= c c++11 +USE_LANGUAGES= c gnu++11 +BUILDLINK_TRANSFORM+= rm:-std=c++11 # for alloca(3) USE_TOOLS+= gmake OBJDIR= ../build diff --git a/graphics/openimageio/distinfo b/graphics/openimageio/distinfo index a523c57290c..d441a5111c4 100644 --- a/graphics/openimageio/distinfo +++ b/graphics/openimageio/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.20 2019/12/29 10:15:04 markd Exp $ +$NetBSD: distinfo,v 1.21 2020/03/17 14:19:02 ryoon Exp $ SHA1 (oiio-Release-1.8.15.tar.gz) = 3c8139af5c68d63a6fecd3096c0b78e34698c57b RMD160 (oiio-Release-1.8.15.tar.gz) = b434b141e44e8ce2b4433e286b795654e3f850e4 SHA512 (oiio-Release-1.8.15.tar.gz) = e022e5c7e300d3dd952bcf3476e1b676a8931f67ba6b3959b26c75b9709907ac1c1b99de651f5876045f9a333e325a161b0d5159cb5bf385eb4f9f90a04707c7 Size (oiio-Release-1.8.15.tar.gz) = 27828632 bytes +SHA1 (patch-Makefile) = 87ba502488af01b266afcd8135b9d9ff52fe9752 SHA1 (patch-src_cmake_install.cmake) = 8db6fbf92878d237dc08a761481febef45cb9f05 SHA1 (patch-src_cmake_modules_FindOpenEXR.cmake) = c8ff004f262b2d47d4f00dace858a3dad8bd3833 SHA1 (patch-src_include_OpenImageIO_strutil.h) = 881d5df34c8aa7641f018d64cd8b080534813db2 diff --git a/graphics/openimageio/patches/patch-Makefile b/graphics/openimageio/patches/patch-Makefile new file mode 100644 index 00000000000..10208c1b48e --- /dev/null +++ b/graphics/openimageio/patches/patch-Makefile @@ -0,0 +1,18 @@ +$NetBSD: patch-Makefile,v 1.1 2020/03/17 14:19:03 ryoon Exp $ + +* Fix POSIX shell portability issues + +--- Makefile.orig 2018-10-01 21:26:14.000000000 +0000 ++++ Makefile +@@ -389,9 +389,9 @@ TEST_FLAGS += --force-new-ctest-process + # 'make test' does a full build and then runs all tests + test: cmake + @ ${CMAKE} -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests ${TEST_FLAGS}..." +- @ # if [ "${CODECOV}" == "1" ] ; then lcov -b ${build_dir} -d ${build_dir} -z ; rm -rf ${build_dir}/cov ; fi ++ @ # if [ "${CODECOV}" = "1" ] ; then lcov -b ${build_dir} -d ${build_dir} -z ; rm -rf ${build_dir}/cov ; fi + @ ( cd ${build_dir} ; PYTHONPATH=${PWD}/${build_dir}/src/python ctest -E broken ${TEST_FLAGS} ) +- @ ( if [ "${CODECOV}" == "1" ] ; then \ ++ @ ( if [ "${CODECOV}" = "1" ] ; then \ + cd ${build_dir} ; \ + lcov -b . -d . -c -o cov.info ; \ + lcov --remove cov.info "/usr*" -o cov.info ; \ |