diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-27 11:59:45 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-27 12:02:38 -0400 |
| commit | 51cd2cfef22894b995fa66c43f06d2ce25bde934 (patch) | |
| tree | 9778a3c08e98b4cac17d67992bc6df0ed31cad6a | |
| parent | 832c016fccbb714c53fc084cddf303890ded1e04 (diff) | |
remove chrpath hack
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.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | doc/install/fromsource.mdwn | 2 |
4 files changed, 3 insertions, 7 deletions
@@ -33,6 +33,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium * sync: Fix bug that prevented pulling changes into direct mode repositories that were committed to remotes using git commit 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 @@ -35,11 +35,6 @@ git-annex: tmp/configure-stamp else \ ln -sf dist/build/git-annex/git-annex git-annex; \ 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 ln -sf git-annex git-annex-shell diff --git a/debian/control b/debian/control index e9fafef6a..abca2c06a 100644 --- a/debian/control +++ b/debian/control @@ -87,7 +87,6 @@ Build-Depends: curl, openssh-client, git-remote-gcrypt (>= 0.20130908-6), - chrpath, gnupg, gpg-agent, Maintainer: Richard Hartmann <richih@debian.org> diff --git a/doc/install/fromsource.mdwn b/doc/install/fromsource.mdwn index 7973e3dc9..c46321099 100644 --- a/doc/install/fromsource.mdwn +++ b/doc/install/fromsource.mdwn @@ -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, 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. Once the C libraries are installed, run inside the source tree: |