3rdparty: tiff patch for TIFF_UINT64_T (useful for macOS)

This commit is contained in:
Thomas Bernard 2019-01-22 22:43:53 +01:00
parent a09165eeb9
commit 4f394da998
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 32 additions and 0 deletions

2
3rdparty/Makefile vendored
View File

@ -48,6 +48,7 @@ LIBTIFF = tiff-4.0.10
LIBTIFFARCH = $(LIBTIFF).tar.gz
LIBTIFFURL = https://download.osgeo.org/libtiff/$(LIBTIFFARCH)
LIBTIFFURLALT = https://fossies.org/linux/misc/$(LIBTIFFARCH)
LIBTIFFPATCHES = tiff-uint64_long_long.patch
ZLIB=zlib-1.2.11
ZLIBARCH=$(ZLIB).tar.gz
ZLIBURL=https://www.zlib.net/$(ZLIBARCH)
@ -400,6 +401,7 @@ endif
$(LIBTIFF)/.ok: archives/$(LIBTIFFARCH)
$(TAR) xzf $<
cd $(LIBTIFF) ; for p in $(LIBTIFFPATCHES) ; do echo "applying $$p" ; patch -p0 < ../$$p ; done
touch $@
$(PREFIX)/lib/libpng.a: $(PREFIX)/lib/libz.a

30
3rdparty/tiff-uint64_long_long.patch vendored Normal file
View File

@ -0,0 +1,30 @@
$NetBSD$
To avoid conflict with Security.framework on OS X, prefer unsigned long long as 64-bit type.
--- configure.orig 2015-08-24 22:13:55.000000000 +0000
+++ configure
@@ -17750,11 +17750,7 @@ _ACEOF
$as_echo_n "checking for unsigned 64-bit type... " >&6; }
UINT64_T='none'
UINT64_FORMAT='none'
-if test $ac_cv_sizeof_unsigned_long -eq 8
-then
- UINT64_T='unsigned long'
- UINT64_FORMAT='"%lu"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq 8
+if test $ac_cv_sizeof_unsigned_long_long -eq 8
then
UINT64_T='unsigned long long'
case "${host_os}" in
@@ -17766,6 +17762,10 @@ then
UINT64_FORMAT='"%llu"'
;;
esac
+elif test $ac_cv_sizeof_unsigned_long -eq 8
+then
+ UINT64_T='unsigned long'
+ UINT64_FORMAT='"%lu"'
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UINT64_T" >&5
$as_echo "$UINT64_T" >&6; }