Specify static linking

Author: twistedfall

build/cmake_probe.rs

@@ -75,7 +75,7 @@ impl From<&str> for LinkLib {
 	}
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct LinkSearch(pub Linkage, pub PathBuf);
 
 impl LinkSearch {

build/library.rs

@@ -100,9 +100,9 @@ impl Linkage {
 	}
 
 	pub fn as_cargo_rustc_link_spec_no_static(self) -> &'static str {
-		// fixme: specifying static linkage breaks things in CI
 		match self {
-			Self::Default | Self::Dynamic | Self::Static => "",
+			Self::Default | Self::Dynamic => "",
+			Self::Static => "static=",
 			Self::Framework => "framework=",
 		}
 	}
@@ -182,17 +182,18 @@ impl Library {
 	fn process_link_paths<'a>(link_paths: Option<EnvList>, sys_link_paths: Vec<LinkSearch>) -> impl Iterator<Item = String> + 'a {
 		Self::process_env_var_list(link_paths, sys_link_paths)
 			.into_iter()
-			.flat_map(move |path| {
-				iter::once(path.emit_cargo_rustc_link_search()).chain(
-					(*TARGET_VENDOR_APPLE && path.0 != Linkage::Framework)
-						.then(|| LinkSearch(Linkage::Framework, path.1).emit_cargo_rustc_link_search()),
-				)
+			.flat_map(move |search| {
+				iter::once(search.clone())
+					.chain((*TARGET_VENDOR_APPLE && search.0 != Linkage::Framework).then(|| LinkSearch(Linkage::Framework, search.1)))
 			})
+			.inspect(|s| eprintln!("=== Link search path: {s:?}"))
+			.map(|search| search.emit_cargo_rustc_link_search())
 	}
 
 	fn process_link_libs<'a>(link_libs: Option<EnvList>, sys_link_libs: Vec<LinkLib>) -> impl Iterator<Item = String> + 'a {
 		Self::process_env_var_list(link_libs, sys_link_libs)
 			.into_iter()
+			.inspect(|l| eprintln!("=== Linking to library: {l:?}"))
 			.map(|l| l.emit_cargo_rustc_link())
 	}
 

ci/script.sh

@@ -65,7 +65,7 @@ elif [[ "$os_family" == "Linux" ]]; then
 		export OPENCV_LINK_LIBS="+freetype,bz2,brotlidec,brotlicommon"
 	else
 		if [[ "${OPENCV_LINKAGE:-dynamic}" == "static" ]]; then # static build
-			export OPENCV_LINK_LIBS=opencv_gapi,opencv_highgui,opencv_objdetect,opencv_dnn,opencv_videostab,opencv_calib3d,opencv_features2d,opencv_stitching,opencv_flann,opencv_videoio,opencv_rgbd,opencv_aruco,opencv_video,opencv_ml,opencv_imgcodecs,opencv_imgproc,opencv_core,ade,ittnotify,liblibwebp,liblibtiff,liblibjpeg-turbo,liblibpng,liblibopenjp2,ippiw,ippicv,liblibprotobuf,quirc,zlib
+			export OPENCV_LINK_LIBS=opencv_gapi.a,opencv_highgui.a,opencv_objdetect.a,opencv_dnn.a,opencv_videostab.a,opencv_calib3d.a,opencv_features2d.a,opencv_stitching.a,opencv_flann.a,opencv_videoio.a,opencv_rgbd.a,opencv_aruco.a,opencv_video.a,opencv_ml.a,opencv_imgcodecs.a,opencv_imgproc.a,opencv_core.a,ade,ittnotify,liblibwebp,liblibtiff,liblibjpeg-turbo,liblibpng,liblibopenjp2,ippiw,ippicv,liblibprotobuf,quirc,zlib
 		fi
 	fi
 fi