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

remove chrpath hack

Browse source 
Makefile: Remove chrpath workaround for bug in cabal,  which is no longer
needed.

https://github.com/haskell/cabal/issues/2717 says it uses RUNPATH instead
of RPATH now, but I don't even see that for statically linked libraries;
the bug with that appears to be fixed.

cabal-install version 1.24.0.2
compiled using version 1.24.2.0 of the Cabal library

I left the rpath removal using otool on OSX because those straight up
broke the linker, and I don't know if the OSX autobuilder is updated to
a new enough cabal to not need it.

This commit was sponsored by Ewen McNeill on Patreon.
This commit is contained in:
Joey Hess 2018-02-27 11:59:45 -04:00
parent b1c0e44c33
commit 8f71b316c9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -33,6 +33,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium
* sync: Fix bug that prevented pulling changes into direct mode * sync: Fix bug that prevented pulling changes into direct mode
repositories that were committed to remotes using git commit repositories that were committed to remotes using git commit
rather than git-annex sync. rather than git-annex sync.
* Makefile: Remove chrpath workaround for bug in cabal,
which is no longer needed.
-- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400 -- Joey Hess <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400

5
Makefile
View file

@ -35,11 +35,6 @@ git-annex: tmp/configure-stamp
else \ else \
ln -sf dist/build/git-annex/git-annex git-annex; \ ln -sf dist/build/git-annex/git-annex git-annex; \
fi fi
# Work around https://github.com/haskell/cabal/issues/3524
# when not linked dynamically to haskell libs
@if ! ldd git-annex | grep -q libHS; then \
chrpath -d git-annex || echo "** warning: unable to chrpath git-annex; it will be a little bit slower than necessary"; \
fi
git-annex-shell: git-annex git-annex-shell: git-annex
ln -sf git-annex git-annex-shell ln -sf git-annex git-annex-shell

1
debian/control vendored
View file

@ -87,7 +87,6 @@ Build-Depends:
curl, curl,
openssh-client, openssh-client,
git-remote-gcrypt (>= 0.20130908-6), git-remote-gcrypt (>= 0.20130908-6),
chrpath,
gnupg, gnupg,
gpg-agent, gpg-agent,
Maintainer: Richard Hartmann <richih@debian.org> Maintainer: Richard Hartmann <richih@debian.org>

2
doc/install/fromsource.mdwn
View file

@ -83,7 +83,7 @@ Get the git-annex source code, and inside the source tree, run:
To build with all features enabled, including the assistant and webapp, To build with all features enabled, including the assistant and webapp,
you will need to install several C libraries and their headers, you will need to install several C libraries and their headers,
including libgnutls, libgsasl, libxml2, libmagic, zlib, and chrpath. How to do including libgnutls, libgsasl, libxml2, libmagic, and zlib. How to do
that for your OS is beyond the scope of this page. that for your OS is beyond the scope of this page.
Once the C libraries are installed, run inside the source tree: Once the C libraries are installed, run inside the source tree: