3rdparty: use generic rules for tiff
This commit is contained in:
parent
981bcd37b4
commit
83a85cb3fb
16
3rdparty/Makefile
vendored
16
3rdparty/Makefile
vendored
@ -75,6 +75,12 @@ LIBTIFFARCH = $(LIBTIFF).tar.gz
|
||||
LIBTIFFURL = https://download.osgeo.org/libtiff/$(LIBTIFFARCH)
|
||||
LIBTIFFURLALT = https://fossies.org/linux/misc/$(LIBTIFFARCH)
|
||||
LIBTIFFPATCHES = tiff-uint64_long_long.patch
|
||||
# additionnal variables for the generic rules to work :
|
||||
TIFFARCH = $(LIBTIFFARCH)
|
||||
TIFFURL = $(LIBTIFFURL)
|
||||
TIFFURLALT = $(LIBTIFFURLALT)
|
||||
TIFFPATCHES = $(LIBTIFFPATCHES)
|
||||
TIFFSHA256 = 2c52d11ccaf767457db0c46795d9c7d1a8d8f76f68b0b800a3dfe45786b996e4
|
||||
ZLIBVER=1.2.11
|
||||
ZLIB=zlib-$(ZLIBVER)
|
||||
ZLIBARCH=$(ZLIB).tar.gz
|
||||
@ -437,12 +443,6 @@ ifdef WIN32
|
||||
cat $(LIBTIFF)/COPYRIGHT >> ../doc/README-tiff.txt
|
||||
endif
|
||||
|
||||
# variable names doesn't match directory name, so the generic rule won't work
|
||||
$(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
|
||||
|
||||
$(PREFIX)/lib/libpng.a: $(LIBPNG)/.ok
|
||||
@ -499,10 +499,6 @@ archives/$(JPEGARCH):
|
||||
@$(MKDIR) $(@D)
|
||||
cd $(@D) && $(GETURL) $(JPEGURL)
|
||||
|
||||
archives/$(LIBTIFFARCH):
|
||||
@$(MKDIR) $(@D)
|
||||
cd $(@D) && ( $(GETURL) $(LIBTIFFURL) || $(GETURL) $(LIBTIFFURLALT) )
|
||||
|
||||
# generic rule to download tarballs
|
||||
archives/%.tar.gz:
|
||||
@$(MKDIR) $(@D)
|
||||
|
||||
4
3rdparty/tiff-uint64_long_long.patch
vendored
4
3rdparty/tiff-uint64_long_long.patch
vendored
@ -2,8 +2,8 @@ $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
|
||||
--- a/configure 2015-08-24 22:13:55.000000000 +0000
|
||||
+++ b/configure
|
||||
@@ -17750,11 +17750,7 @@ _ACEOF
|
||||
$as_echo_n "checking for unsigned 64-bit type... " >&6; }
|
||||
UINT64_T='none'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user