diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Utility/DiskFree.hs | 2 | ||||
| -rw-r--r-- | Utility/libdiskfree.c (renamed from Utility/diskfree.c) | 0 | ||||
| -rw-r--r-- | Utility/libdiskfree.h (renamed from Utility/diskfree.h) | 0 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/case-insensitive.mdwn | 3 | ||||
| -rw-r--r-- | git-annex.cabal | 6 |
7 files changed, 9 insertions, 5 deletions
@@ -12,7 +12,7 @@ GHCMAKE=ghc $(GHCFLAGS) --make bins=git-annex mans=git-annex.1 git-annex-shell.1 sources=Build/SysConfig.hs Utility/Touch.hs -clibs=Utility/diskfree.o +clibs=Utility/libdiskfree.o all=$(bins) $(mans) docs diff --git a/Utility/DiskFree.hs b/Utility/DiskFree.hs index bde6ef8ca..8d07afaf2 100644 --- a/Utility/DiskFree.hs +++ b/Utility/DiskFree.hs @@ -15,7 +15,7 @@ import Foreign.C.Types import Foreign.C.String import Foreign.C.Error -foreign import ccall unsafe "diskfree.h diskfree" c_diskfree +foreign import ccall unsafe "libdiskfree.h diskfree" c_diskfree :: CString -> IO CULLong getDiskFree :: String -> IO (Maybe Integer) diff --git a/Utility/diskfree.c b/Utility/libdiskfree.c index b68abd0c4..b68abd0c4 100644 --- a/Utility/diskfree.c +++ b/Utility/libdiskfree.c diff --git a/Utility/diskfree.h b/Utility/libdiskfree.h index e5b84754f..e5b84754f 100644 --- a/Utility/diskfree.h +++ b/Utility/libdiskfree.h diff --git a/debian/changelog b/debian/changelog index 0884f7574..abc3ae512 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ git-annex (3.20120407) UNRELEASED; urgency=low configuration setting, doing fuzzy matching using the restricted Damerau-Levenshtein edit distance, just as git does. This adds a build dependency on the haskell edit-distance library. + * Renamed diskfree.c to avoid OSX case insensativity bug. -- Joey Hess <joeyh@debian.org> Sun, 08 Apr 2012 12:23:42 -0400 diff --git a/doc/bugs/case-insensitive.mdwn b/doc/bugs/case-insensitive.mdwn index 21c2c4ec4..a917f64c2 100644 --- a/doc/bugs/case-insensitive.mdwn +++ b/doc/bugs/case-insensitive.mdwn @@ -15,3 +15,6 @@ What version of git-annex are you using? On what operating system? Please provide any additional information below. > The problem is that since `DiskFree.hs` generates `DiskFree.o` and `diskfree.c` generates `diskfree.o`, a case-insensitive file system overwrites one object file with the other. Renaming `diskfree.c` to `diskfreec.c` and changing the corresponding filenames in `git-annex.cabal` fixes the problem. + +>> Man, not this again. The 80's called, they want their +>> unix portability wars back. [[fixed|done]]. --[[Joey]] diff --git a/git-annex.cabal b/git-annex.cabal index 0f2858985..df4001189 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -34,17 +34,17 @@ Executable git-annex base >= 4.5, base < 5, monad-control, transformers-base, lifted-base, IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance Other-Modules: Utility.Touch - C-Sources: Utility/diskfree.c + C-Sources: Utility/libdiskfree.c Executable git-annex-shell Main-Is: git-annex-shell.hs - C-Sources: Utility/diskfree.c + C-Sources: Utility/libdiskfree.c Test-Suite test Type: exitcode-stdio-1.0 Main-Is: test.hs Build-Depends: testpack, HUnit - C-Sources: Utility/diskfree.c + C-Sources: Utility/libdiskfree.c source-repository head type: git |