mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix linker optimisation in linux standalone tarballs

Browse source 
Was only symlinking when there is a usr/ directory, but with usr/ merge,
there are none.

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2023-09-07 12:59:20 -04:00
parent 9563830529
commit 32cb2bd3fa
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/LinuxMkLibs.hs
View file

@ -85,7 +85,9 @@ consolidateUsrLib top libdirs = go [] libdirs
renameFile src dst renameFile src dst
symlinkHwCapDirs top d symlinkHwCapDirs top d
go c rest go c rest
_ -> go (x:c) rest _ -> do
symlinkHwCapDirs top x
go (x:c) rest
{- The linker looks for optimised versions of libraries depending on the {- The linker looks for optimised versions of libraries depending on the
- hardware capabilities. That causes a lot of extra work searching for - hardware capabilities. That causes a lot of extra work searching for

1
CHANGELOG
View file

@ -1,6 +1,7 @@
git-annex (10.20230829) UNRELEASED; urgency=medium git-annex (10.20230829) UNRELEASED; urgency=medium
* Removed the vendored git-lfs and the GitLfs build flag. * Removed the vendored git-lfs and the GitLfs build flag.
* Fix linker optimisation in linux standalone tarballs.
-- Joey Hess <id@joeyh.name> Mon, 28 Aug 2023 13:10:17 -0400 -- Joey Hess <id@joeyh.name> Mon, 28 Aug 2023 13:10:17 -0400

12
doc/todo/the_same_path_looked_up_3_times_for_libpcre__42__.so/comment_3_89701d7011c3c9085afaab33aa16c39f._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2023-09-07T16:50:20Z"
content="""
I tracked this down: The /usr merge broke the optimisation,
since it was symlinking the tls and hwcaps directories only
when there was a /usr directory.
Here I was seeing 3 failed stats for libpcre in a `git-annex version`
and with the fix, it's down to 0.
"""]]