diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-07 19:18:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-07 19:18:23 -0400 |
| commit | 82b1d7300f3890722c871cf73519a00a92b8beba (patch) | |
| tree | 1cc22063bab9dbf72604696c97c882578a31c9b5 | |
| parent | 6fc351a9b4670aac7247d088c7aad7b4d505999d (diff) | |
| parent | eefd09d53cfbbaff1c603ebfc288a1f6f8cd3002 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
| -rw-r--r-- | doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn | 6 | ||||
| -rw-r--r-- | standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch | 26 |
2 files changed, 32 insertions, 0 deletions
diff --git a/doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn b/doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn new file mode 100644 index 000000000..3876f2197 --- /dev/null +++ b/doc/todo/wishlist:_print_locations_for_files_in_rsync_remote.mdwn @@ -0,0 +1,6 @@ +Based on an irc conversation earlier today: + +19:50 < warp> joeyh: what is the best way to figure out the (remote) filename for a file stored in an rsync remote? + +20:43 < joeyh> warp: re your other question, probably the best thing would be to make the whereis command print out locations for each remote, as it always does for the web special remotes + diff --git a/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch b/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch new file mode 100644 index 000000000..c38e9fdff --- /dev/null +++ b/standalone/android/haskell-patches/cipher-aes_0.1.7-0001-fix-cross-build.patch @@ -0,0 +1,26 @@ +From ef1cfb5c9731f1e99d013e704ed465d3cff35df2 Mon Sep 17 00:00:00 2001 +From: Joey Hess <joey@kitenet.net> +Date: Tue, 7 May 2013 17:38:22 -0400 +Subject: [PATCH] fix cross build + +--- + cipher-aes.cabal | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/cipher-aes.cabal b/cipher-aes.cabal +index 02ddfd0..c47bf0c 100644 +--- a/cipher-aes.cabal ++++ b/cipher-aes.cabal +@@ -38,9 +38,6 @@ Library + cbits/aes.c + cbits/gf.c + cbits/cpu.c +- if os(linux) && (arch(i386) || arch(x86_64)) +- CC-options: -mssse3 -maes -mpclmul -DWITH_AESNI +- C-sources: cbits/aes_x86ni.c + + Test-Suite test-cipher-aes + type: exitcode-stdio-1.0 +-- +1.7.10.4 + |