diff --git a/ChangeLog.md b/ChangeLog.md --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +## 0.3.2.6 + +* Fix Arch Linux build [#15](https://github.com/psibi/download/pull/15) + ## 0.3.2.5 * OSX Support added. Thanks to Brian Crowder. diff --git a/cbits/common.h b/cbits/common.h --- a/cbits/common.h +++ b/cbits/common.h @@ -33,6 +33,8 @@ #ifndef COMMON_H_INCLUDED #define COMMON_H_INCLUDED +#include + /* BSD seems to use this alot - we don't have it */ #define __DECONST(type, v) (type)((uintptr_t)(void *)(v)) diff --git a/download.cabal b/download.cabal --- a/download.cabal +++ b/download.cabal @@ -1,84 +1,67 @@ -name: download -version: 0.3.2.5 -homepage: https://github.com/psibi/download -synopsis: High-level file download based on URLs -description: High-level file download based on URLs -extra-source-files: ChangeLog.md README.md -bug-reports: https://github.com/psibi/download/issues -category: Network -license: BSD3 -license-file: LICENSE -copyright: (c) 2008-2011, Don Stewart -author: Don Stewart -maintainer: Sibi Prabakaran -cabal-version: >= 1.8 -build-type: Simple -tested-with: GHC ==7.10.3 - --- flag external --- description: Build with an external libdownload --- default: False +name: download +version: 0.3.2.6 +cabal-version: >=1.8 +build-type: Simple +license: BSD3 +license-file: LICENSE +copyright: (c) 2008-2011, Don Stewart +maintainer: Sibi Prabakaran +homepage: https://github.com/psibi/download +bug-reports: https://github.com/psibi/download/issues +synopsis: High-level file download based on URLs +description: + High-level file download based on URLs +category: Network +author: Don Stewart +tested-with: GHC ==7.10.3 +extra-source-files: + ChangeLog.md + README.md -Source-Repository head - Type: git - Location: https://github.com/psibi/download +source-repository head + type: git + location: https://github.com/psibi/download library - exposed-modules: Network.Download - extensions: CPP, - ForeignFunctionInterface, - EmptyDataDecls, - GeneralizedNewtypeDeriving - - ghc-options: -Wall - - build-depends: base >= 3 && < 5, bytestring, - tagsoup >= 0.8, feed, xml - - ------------------------------------------------------------------------ - -- Building libdownload - -- - -- We can build against either an external libdownload, or an internal one. - --- if flag(external) --- extra-libraries: download --- c-sources: cbits/hs_download_utils.c --- include-dirs: cbits --- includes: hs_download_utils.h --- install-includes: hs_download_utils.h --- else - - cc-options: -O2 - -DINET6 - -D_GNU_SOURCE - -D_FILE_OFFSET_BITS=64 - -UDEBUG - - c-sources: cbits/download.c - cbits/common.c - cbits/ftp.c - cbits/http.c - cbits/file.c - cbits/hs_download_utils.c - - include-dirs: cbits - includes: download.h - common.h - ftperr.h - httperr.h - hs_download_utils.h - - install-includes: common.h - download.h - ftperr.h - httperr.h - hs_download_utils.h + exposed-modules: + Network.Download + build-depends: + base >=3 && <5, + bytestring -any, + tagsoup >=0.8, + feed -any, + xml -any + cc-options: -O2 -DINET6 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + -UDEBUG + c-sources: + cbits/download.c + cbits/common.c + cbits/ftp.c + cbits/http.c + cbits/file.c + cbits/hs_download_utils.c + extensions: CPP ForeignFunctionInterface EmptyDataDecls + GeneralizedNewtypeDeriving + includes: + download.h + common.h + ftperr.h + httperr.h + hs_download_utils.h + install-includes: + common.h + download.h + ftperr.h + httperr.h + hs_download_utils.h + include-dirs: cbits + ghc-options: -Wall -test-suite test - type: exitcode-stdio-1.0 - ghc-options: -Wall - main-is: Spec.hs - - build-depends: base >= 4.5 && < 5, - download, - hspec == 2.* +test-suite test + type: exitcode-stdio-1.0 + main-is: Spec.hs + build-depends: + base >=4.5 && <5, + download -any, + hspec ==2.* + ghc-options: -Wall