contrib: declare zlib dependency for gnutls

Change-Id: Ieba48b17bdb9a3a5e70eb94d198cf6eee37a689b

contrib/src/gnutls/rules.mak

@@ -9,6 +9,8 @@ ifeq ($(call need_pkg,"gnutls >= 3.6.7"),)
 PKGS_FOUND += gnutls
 endif
 
+DEPS_gnutls = nettle gmp iconv zlib
+
 $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
 	$(call download,$(GNUTLS_URL))
 
@@ -50,8 +52,6 @@ ifdef HAVE_IOS
 	--without-zstd
 endif
 
-DEPS_gnutls = gmp nettle iconv
-
 
 #Workaround for localtime_r function
 ifdef HAVE_WIN32

contrib/src/libarchive/rules.mak

@@ -6,13 +6,11 @@ ifndef HAVE_MACOSX
 PKGS += libarchive
 ifeq ($(call need_pkg,"libarchive >= 3.4.0"),)
 PKGS_FOUND += libarchive
-else
-DEPS_libarchive += nettle
 endif
 endif
+DEPS_libarchive += nettle gmp zlib
 
 LIBARCHIVE_CMAKECONF := \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_TEST=OFF \
 		-DENABLE_TAR=OFF \

contrib/src/minizip/rules.mak

@@ -12,7 +12,6 @@ endif
 
 
 LIBMINIZIP_CMAKECONF := \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DMZ_LZMA=OFF \
 		-DMZ_FORCE_FETCH_LIBS=ON \

contrib/src/nettle/rules.mak

@@ -7,6 +7,7 @@ PKGS += nettle
 ifeq ($(call need_pkg,"nettle >= 3.6"),)
 PKGS_FOUND += nettle
 endif
+DEPS_nettle = gmp
 
 $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
 	$(call download,$(NETTLE_URL))
@@ -18,7 +19,7 @@ nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
-DEPS_nettle = gmp
+
 
 .nettle: nettle
 ifdef HAVE_IOS

contrib/src/opencv/rules.mak

@@ -7,7 +7,6 @@ DEPS_opencv += opencv_contrib
 
 OPENCV_CMAKECONF := \
 		-DWITH_FFMPEG=OFF \
-		-DCMAKE_BUILD_TYPE=RELEASE \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=no \
 		-DOPENCV_EXTRA_MODULES_PATH="./../../${HOST}/../opencv_contrib/modules" \