revert a few problem areas of git-annex.cabal patch
This commit is contained in:
parent
5f8f83b884
commit
69907e397f
3 changed files with 25 additions and 4 deletions
|
@ -28,6 +28,8 @@ git-annex (6.20180808) UNRELEASED; urgency=medium
|
|||
* S3: Support buckets with versioning enabled. When a remote
|
||||
is configured with exporttree=yes versioning=yes, git-annex can
|
||||
download past versions of exported files from it.
|
||||
* git-annex.cabal: Fix build without assistant, and some other refinements.
|
||||
Thanks fftehnik.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Wed, 08 Aug 2018 11:24:08 -0400
|
||||
|
||||
|
|
|
@ -0,0 +1,20 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 1"""
|
||||
date="2018-09-05T15:23:49Z"
|
||||
content="""
|
||||
Thanks for the patch, but while it is moving in a good direction,
|
||||
it gets some things wrong too. Problems I noticed:
|
||||
|
||||
* It removes the "&& ! os(solaris) && ! os(gnu)" from the assistant flag
|
||||
test, which are important to support building git-annex on hurd and
|
||||
solaris.
|
||||
* Utility.Android is used inside *linux* builds to detect android at
|
||||
runtime. So moving it under the flag(Android) test is wrong and will
|
||||
break all linux builds AFAICS.
|
||||
* Build.DesktopFile is not linked into the assistant, like Build.Configure
|
||||
it's only listed to get the source file into the cabal tarball. Best to
|
||||
keep it with the other such files.
|
||||
|
||||
I've applied the patch but reverted the above changes.
|
||||
"""]]
|
|
@ -420,7 +420,7 @@ Executable git-annex
|
|||
Other-Modules:
|
||||
Remote.Helper.Http
|
||||
|
||||
if flag(Assistant)
|
||||
if flag(Assistant) && ! os(solaris) && ! os(gnu)
|
||||
Build-Depends: mountpoints
|
||||
CPP-Options: -DWITH_ASSISTANT
|
||||
Other-Modules:
|
||||
|
@ -496,7 +496,6 @@ Executable git-annex
|
|||
Assistant.Types.UrlRenderer
|
||||
Assistant.Unused
|
||||
Assistant.Upgrade
|
||||
Build.DesktopFile
|
||||
Command.Assistant
|
||||
Command.Watch
|
||||
Utility.Mounts
|
||||
|
@ -533,8 +532,6 @@ Executable git-annex
|
|||
if flag(Android)
|
||||
Build-Depends: data-endian
|
||||
CPP-Options: -D__ANDROID__ -DANDROID_SPLICES -D__NO_TH__
|
||||
Other-Modules:
|
||||
Utility.Android
|
||||
else
|
||||
Build-Depends: disk-free-space
|
||||
|
||||
|
@ -687,6 +684,7 @@ Executable git-annex
|
|||
Backend.WORM
|
||||
Build.BundledPrograms
|
||||
Build.Configure
|
||||
Build.DesktopFile
|
||||
Build.Mans
|
||||
Build.TestConfig
|
||||
Build.Version
|
||||
|
@ -1006,6 +1004,7 @@ Executable git-annex
|
|||
Upgrade.V4
|
||||
Upgrade.V5
|
||||
Utility.Aeson
|
||||
Utility.Android
|
||||
Utility.Applicative
|
||||
Utility.AuthToken
|
||||
Utility.Base64
|
||||
|
|
Loading…
Reference in a new issue