diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-15 14:49:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-15 14:49:40 -0400 |
| commit | b6f1f7b167f0e7307744d5b8bbc5a329885d944d (patch) | |
| tree | 2b57cf4cdef706c973822530e8f71ad4f1f5bb06 /Makefile | |
| parent | 60e0990f8cf066045ffb4a24229add3bede62b03 (diff) | |
disable ssh connection caching for standalone builds
The standalone build does not bundle its own ssh, so should be built
to support as wide an array of ssh versions as possible, so turn off
connection caching.
Unfortunatly, as implemented this forces a full rebuild when building the
standalone binary, and of course it makes it somewhat slower.
This is not ideal, but neither is probing the ssh version every time it's
run (slow), or once when initializing a repo (fragile).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -142,7 +142,10 @@ THIRDPARTY_BINS=git curl lsof xargs rsync uuid wget gpg \ sha1sum sha224sum sha256sum sha384sum sha512sum LINUXSTANDALONE_DEST=$(GIT_ANNEX_TMP_BUILD_DIR)/git-annex.linux -linuxstandalone: $(bins) +linuxstandalone: + $(make clean) + GIT_ANNEX_LOCAL_FEATURES="$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_OLD_SSH" $(MAKE) + rm -rf "$(LINUXSTANDALONE_DEST)" cp -R standalone/linux "$(LINUXSTANDALONE_DEST)" @@ -178,7 +181,10 @@ linuxstandalone: $(bins) OSXAPP_DEST=$(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg/git-annex.app OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS -osxapp: $(bins) +osxapp: + $(make clean) + GIT_ANNEX_LOCAL_FEATURES="$(GIT_ANNEX_LOCAL_FEATURES) -DWITH_OLD_SSH" $(MAKE) + rm -rf "$(OSXAPP_DEST)" install -d $(GIT_ANNEX_TMP_BUILD_DIR)/build-dmg cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)" |