diff options
author | Joey Hess <joey@kitenet.net> | 2011-03-23 10:55:54 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-03-23 10:55:54 -0400 |
commit | 7da3dc59841180ca65b834c43832cf8cbfd5b8ba (patch) | |
tree | 0b356d58249aad1628769322ad9653ad55befe33 | |
parent | b0eccb003ae70792e89eda54d0c0bea1f38847ba (diff) | |
parent | 6d857b540aab2e80394984572ebd26be31ececff (diff) |
Merge remote-tracking branch 'branchable/master'
4 files changed, 73 insertions, 3 deletions
diff --git a/doc/bugs/Makefile_is_missing_dependancies.mdwn b/doc/bugs/Makefile_is_missing_dependancies.mdwn index 4bda91f17..3e9d6e903 100644 --- a/doc/bugs/Makefile_is_missing_dependancies.mdwn +++ b/doc/bugs/Makefile_is_missing_dependancies.mdwn @@ -1,4 +1,3 @@ - <pre> From e45c73e66fc18d27bdf5797876fbeb07786a4af1 Mon Sep 17 00:00:00 2001 From: Jimmy Tang <jtang@tchpc.tcd.ie> @@ -30,5 +29,19 @@ index 08e2f59..4ae8392 100644 StatFS.hs never gets depended on and compiled, the makefile was just missing something -> Thanks, [done]]! Interested to hear if StatFS.hs works on OSX (no warning) or +> Thanks, [[done]]! Interested to hear if StatFS.hs works on OSX (no warning) or > is a no-op (with warning). --[[Joey]] + +>> +>> for now it gives a warning, it looks like it should be easy enough to add OSX +>> support, I guess it's a case of just digging around documentation to find the equivalent +>> calls/headers. I'll give it a go at making this feature work on OSX and get back to you. +>> + +<pre> +jtang@exia:~/develop/git-annex $ make +hsc2hs StatFS.hsc +StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS +StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS +StatFS.hsc:85:2: warning: #warning free space checking code not available for this OS +</pre> diff --git a/doc/bugs/Makefile_is_missing_dependancies/comment_1_5a3da5f79c8563c7a450aa29728abe7c._comment b/doc/bugs/Makefile_is_missing_dependancies/comment_1_5a3da5f79c8563c7a450aa29728abe7c._comment new file mode 100644 index 000000000..ab8493a7a --- /dev/null +++ b/doc/bugs/Makefile_is_missing_dependancies/comment_1_5a3da5f79c8563c7a450aa29728abe7c._comment @@ -0,0 +1,47 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus" + nickname="Jimmy" + subject="comment 1" + date="2011-03-23T08:21:30Z" + content=""" +Just did some minor digging around and checking, this seems to satisfy the compilers etc... I have yet to confirm that it *really* is working as expected. Also it might be better to check for a darwin operating system instead of apple I think, though I don't know of any one really using a pure darwin OS. But for now it works (I think) + +<pre> +From fbfe27c2e19906ac02e3673b91bffa920f6dae5d Mon Sep 17 00:00:00 2001 +From: Jimmy Tang <jtang@tchpc.tcd.ie> +Date: Wed, 23 Mar 2011 08:15:39 +0000 +Subject: [PATCH] Define (__APPLE__) in StatFS + +At least on OSX 10.6.6 it appears to have the same defintions as +FreeBSD. The build process doesn't complain and the code is enabled, +this needs to be tested and checked more. +--- + StatFS.hsc | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/StatFS.hsc b/StatFS.hsc +index 8b453dc..45fd7e4 100644 +--- a/StatFS.hsc ++++ b/StatFS.hsc +@@ -53,7 +53,7 @@ import Foreign.C.String + import Data.ByteString (useAsCString) + import Data.ByteString.Char8 (pack) + +-#if defined (__FreeBSD__) ++#if defined (__FreeBSD__) || defined(__APPLE__) + # include <sys/param.h> + # include <sys/mount.h> + #else +@@ -84,7 +84,7 @@ data CStatfs + #ifdef UNKNOWN + #warning free space checking code not available for this OS + #else +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__APPLE__) + foreign import ccall unsafe \"sys/mount.h statfs\" + #else + foreign import ccall unsafe \"sys/vfs.h statfs64\" +-- +1.7.4.1 +</pre> +"""]] diff --git a/doc/bugs/softlink_atime.mdwn b/doc/bugs/softlink_atime.mdwn index c62610be0..fe09ade38 100644 --- a/doc/bugs/softlink_atime.mdwn +++ b/doc/bugs/softlink_atime.mdwn @@ -29,7 +29,7 @@ Optionally, editing the meta-data should change the times in all annexes. >>>>> >>>>> So all you have to do is make the pre-commit hook call >>>>> [metastore](http://david.hardeman.nu/software.php). The hook ->>>>> would look like this: ---[[Joey]] [[!tag done]] +>>>>> would look like this: ---[[Joey]] #!/bin/sh git annex pre-commit . @@ -47,3 +47,5 @@ Optionally, editing the meta-data should change the times in all annexes. git add .metadata >>>>>>> -- RichiH + +>>>>>>>> After getting to actually play with this from different machines with a bare git as central instance for several distributed repos, the metastore trick does not work. The .metadata is causing merge conflicts for every pull. I removed the "done" tag from this issue. -- RichiH diff --git a/doc/install/comment_1_d9f7b851567445c7aa7ebbb440781819._comment b/doc/install/comment_1_d9f7b851567445c7aa7ebbb440781819._comment new file mode 100644 index 000000000..616b3c4dd --- /dev/null +++ b/doc/install/comment_1_d9f7b851567445c7aa7ebbb440781819._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://peter-simons.myopenid.com/" + ip="84.189.1.247" + subject="Why isn't this package built with Cabal?" + date="2011-03-23T11:31:06Z" + content=""" +It would be a lot easier to compile this package, if it had a Cabal file to describe the build; especially the build-time dependencies. Why isn't Cabal used? +"""]] |