diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak index 366f63e41c7415f2461ead95dae72f2496e71015..2a4f0615b502ea205df7c24678d0e027b3a2a7eb 100644 --- a/contrib/src/gnutls/rules.mak +++ b/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 diff --git a/contrib/src/libarchive/rules.mak b/contrib/src/libarchive/rules.mak index a51ff7e6973498ea5cf6c4f06248bed9ebd7a052..0f4c45a05e7aeef96a3e52c988677bf247bd83a5 100644 --- a/contrib/src/libarchive/rules.mak +++ b/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 \ diff --git a/contrib/src/minizip/rules.mak b/contrib/src/minizip/rules.mak index fb54b9502d573047b4910ca05e1ec6f559236fac..a24ff27f3d21e09bdba1d0fe66fd16aa7984a281 100644 --- a/contrib/src/minizip/rules.mak +++ b/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 \ diff --git a/contrib/src/nettle/rules.mak b/contrib/src/nettle/rules.mak index 356499387bd6bdfc9bf3ff11a782a9de0fc059eb..4f7b0cf604625bce4aca2a9c5839ec509a4eaff2 100644 --- a/contrib/src/nettle/rules.mak +++ b/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 diff --git a/contrib/src/opencv/rules.mak b/contrib/src/opencv/rules.mak index f13cfbd82a8ea6b6625be5edfedce27b16c9e710..19afe27e9164278a93a2e7c0ab9f4830a3e6ad32 100644 --- a/contrib/src/opencv/rules.mak +++ b/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" \