Stop bundling curl in the OSX dmg

New curl binary links to libldap with a @loader_path that prevents using
the binary when the dmg is used elsewhere.
See https://github.com/datalad/git-annex/issues/170

git-annex doesn't use curl by default anyway, so it doesn't really need to
be included in the dmg.
This commit is contained in:
Joey Hess 2023-08-15 14:21:53 -04:00
parent 9fffa85a9e
commit 571a516ed2
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 4 additions and 6 deletions

View file

@ -63,14 +63,11 @@ preferredBundledPrograms = catMaybes
, Just "sh"
-- used by git-annex when available
, Just "uname"
-- Included in git for Windows
, Just "cp"
#endif
, BuildInfo.lsof
, BuildInfo.gcrypt
#ifndef mingw32_HOST_OS
-- These utilities are included in git for Windows
, ifset BuildInfo.curl "curl"
, Just "cp"
#endif
#ifdef linux_HOST_OS
-- used to unpack the tarball when upgrading
, Just "gunzip"

View file

@ -96,7 +96,7 @@ otool appbase installedbins replacement_libs libmap = do
-- to find real path to library, but for now, skip it.
not ("@executable_path" `isInfixOf` s)
&& not ("@loader_path" `isInfixOf` s)
-- OSX framekworks such as Cocoa are too tightly tied to
-- OSX frameworks such as Cocoa are too tightly tied to
-- a specific OSX version, so don't bundle.
&& not (".framework" `isInfixOf` s)
-- libSystem.B is tightly tied to frameworks.

View file

@ -7,6 +7,7 @@ git-annex (10.20230803) UNRELEASED; urgency=medium
* Fix behavior when importing a tree from a directory remote when the
directory does not exist. An empty tree was imported, rather than the
import failing.
* Stop bundling curl in the OSX dmg.
-- Joey Hess <id@joeyh.name> Mon, 07 Aug 2023 13:04:13 -0400