Renamed diskfree.c to avoid OSX case insensativity bug.

This commit is contained in:
Joey Hess 2012-04-13 11:26:39 -04:00
parent fdb246044c
commit 3642c72320
7 changed files with 9 additions and 5 deletions

View file

@ -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

View file

@ -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)

1
debian/changelog vendored
View file

@ -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

View file

@ -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]]

View file

@ -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