From fe310ebf7650edd9583a3742a3d64738a978072a Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Fri, 12 May 2017 02:54:43 +0000 Subject: [PATCH] graphics/argyllcms: Fix build on powerpc64 PR: 217215 [1] PR: 203806 [2] Submitted by: Curtis Hamilton [1] Submitted by: Justin Hibbits [2] Approved by: kwm (maintainer) --- graphics/argyllcms/Makefile | 2 -- graphics/argyllcms/files/patch-Jambase | 15 +++++++++++++++ .../argyllcms/files/patch-ccast_axTLS_os__int.h | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 graphics/argyllcms/files/patch-Jambase create mode 100644 graphics/argyllcms/files/patch-ccast_axTLS_os__int.h diff --git a/graphics/argyllcms/Makefile b/graphics/argyllcms/Makefile index e859633bd1fe..d4cb8923c74c 100644 --- a/graphics/argyllcms/Makefile +++ b/graphics/argyllcms/Makefile @@ -13,8 +13,6 @@ COMMENT= ICC compatible color management system LICENSE= AGPLv3 -BROKEN_powerpc64= Does not build - BUILD_DEPENDS= jam:devel/jam LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng16.so:graphics/png diff --git a/graphics/argyllcms/files/patch-Jambase b/graphics/argyllcms/files/patch-Jambase new file mode 100644 index 000000000000..8f9dcd01a780 --- /dev/null +++ b/graphics/argyllcms/files/patch-Jambase @@ -0,0 +1,15 @@ +--- Jambase.bak 2016-09-28 02:58:53.000000000 +0000 ++++ Jambase 2017-05-11 19:43:36.780841000 +0000 +@@ -999,7 +999,11 @@ + # General defaults; a lot like UNIX + # + +- AR ?= ar rusc ; ++ if ! $(AR) { ++ AR = ar rusc ; ++ } else { ++ AR += rusc ; ++ } + AS ?= as ; + ASFLAGS ?= ; + AWK ?= awk ; diff --git a/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h b/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h new file mode 100644 index 000000000000..28bbdf9049fc --- /dev/null +++ b/graphics/argyllcms/files/patch-ccast_axTLS_os__int.h @@ -0,0 +1,11 @@ +--- ./ccast/axTLS/os_int.h.orig ++++ ./ccast/axTLS/os_int.h +@@ -34,6 +34,7 @@ + #if (__STDC_VERSION__ >= 199901L) /* C99 */ \ + || defined(_STDINT_H_) || defined(_STDINT_H) \ + || defined(_SYS_TYPES_H) \ ++ || defined(__powerpc64__) || defined(POWERPC64) \ + || (defined(__APPLE__) && defined(__POWERPC__)) + + #include +