From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 3 Jan 2022 19:05:15 +0000 (-0400)
Subject: assume @RPATH libs are present
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~53^2~396
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77048906a44656ff81a5a780d283ed3b356eb48a;p=git-annex.git

assume @RPATH libs are present

Previous change caused them to be skipped. Probably when @RPATH is
included in the path, it's a path to a file that actually exists.

Sponsored-by: Dartmouth College's Datalad project
---

diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index 2adf3c61a2..aadd9519ed 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -106,12 +106,14 @@ otool appbase installedbins replacement_libs libmap = do
 		-- _inflateValidate symbol. So, avoid bundling libz unless
 		-- this incompatability is resolved.
 		&& not ("libz." `isInfixOf` s)
-	lib_present s = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s))
-		( return True
-		, do
-			hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s
-			return False
-		)
+	lib_present s
+		| "@rpath" `isInfixOf` s = return True
+		| otherwise = ifM (isJust <$> catchMaybeIO (getSymbolicLinkStatus s))
+			( return True
+			, do
+				hPutStrLn stderr $ "note: skipping library that is not present on disk: " ++ s
+				return False
+			)
 	process c [] rls m = return (nub $ concat c, rls, m)
 	process c (file:rest) rls m = do
 		_ <- boolSystem "chmod" [Param "755", File file]