diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-29 15:51:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-29 15:51:21 -0400 |
| commit | d26d8490cbd6988fd71a93cc312505f44b7c0075 (patch) | |
| tree | a7b96431aafe7c5a72a68b1a6546eefa51e72865 | |
| parent | 709958c1bb8768b80d24381244efa790190a8167 (diff) | |
Include ssh in standalone builds.
There are two reasons to to so. First, it allows not building with
WITH_OLD_SSH, and using ssh connection caching.
Second, per
http://git-annex.branchable.com/bugs/OSX_app_issues/#comment-3bdbc400a7c87c5cbc16e5aab5a52ac3
ssh can fail when run from the standalone build, due to library
incompatabilities. Building in ssh will avoid this.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -144,11 +144,11 @@ hackage: sdist @cabal upload dist/*.tar.gz THIRDPARTY_BINS=git curl lsof xargs rsync uuid wget gpg \ - sha1sum sha224sum sha256sum sha384sum sha512sum cp + sha1sum sha224sum sha256sum sha384sum sha512sum cp ssh LINUXSTANDALONE_DEST=$(GIT_ANNEX_TMP_BUILD_DIR)/git-annex.linux linuxstandalone: - GIT_ANNEX_LOCAL_FEATURES="$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_OLD_SSH" $(MAKE) git-annex + $(MAKE) git-annex rm -rf "$(LINUXSTANDALONE_DEST)" @@ -186,7 +186,7 @@ linuxstandalone: OSXAPP_DEST=$(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg/git-annex.app OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS osxapp: - GIT_ANNEX_LOCAL_FEATURES="$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_OLD_SSH" $(MAKE) git-annex + $(MAKE) git-annex rm -rf "$(OSXAPP_DEST)" install -d $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg diff --git a/debian/changelog b/debian/changelog index 36c066998..440c19514 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ git-annex (3.20121128) UNRELEASED; urgency=low one-click enabling of the repository. * Fix broken .config/git-annex/program installed by standalone tarball. * assistant: Retrival from glacier now handled. + * Include ssh in standalone tarball and OSX app. -- Joey Hess <joeyh@debian.org> Wed, 28 Nov 2012 13:31:07 -0400 |