diff options
| -rw-r--r-- | BuildFlags.hs | 4 | ||||
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | CmdLine/GitAnnex.hs | 9 | ||||
| -rw-r--r-- | doc/bugs/bind__58___resource_busy___40__Address_already_in_use__41__/comment_3_65488c9eacd5c007151e35504aab92c9._comment | 11 | ||||
| -rw-r--r-- | git-annex.cabal | 9 |
5 files changed, 15 insertions, 21 deletions
diff --git a/BuildFlags.hs b/BuildFlags.hs index 769e8f3bc..3a737589f 100644 --- a/BuildFlags.hs +++ b/BuildFlags.hs @@ -79,10 +79,6 @@ buildFlags = filter (not . null) #ifdef WITH_MAGICMIME , "MagicMime" #endif -#ifdef WITH_EKG -#warning Building with EKG. This build of git-annex should only be used for performance debugging, not for production use.. - , "EKG" -#endif -- Always enabled now, but users may be used to seeing these flags -- listed. , "Feeds" @@ -9,6 +9,9 @@ git-annex (6.20160614) UNRELEASED; urgency=medium * Remove unnecessary rpaths in the git-annex binary, but only when it's built using make, not cabal. This speeds up git-annex statup time by around 50%. + * Remove the EKG build flag, since Gentoo for some reason decided to + enable this flag, depsite it not being intended for production use and + so enabled by default. -- Joey Hess <id@joeyh.name> Mon, 13 Jun 2016 21:52:24 -0400 diff --git a/CmdLine/GitAnnex.hs b/CmdLine/GitAnnex.hs index c3049cf9e..e989f3f43 100644 --- a/CmdLine/GitAnnex.hs +++ b/CmdLine/GitAnnex.hs @@ -119,9 +119,6 @@ import qualified Command.TestRemote #ifdef WITH_BENCHMARK import qualified Command.Benchmark #endif -#ifdef WITH_EKG -import System.Remote.Monitoring -#endif cmds :: Parser TestOptions -> Maybe TestRunner -> [Command] cmds testoptparser testrunner = @@ -232,11 +229,7 @@ cmds testoptparser testrunner = ] run :: Parser TestOptions -> Maybe TestRunner -> [String] -> IO () -run testoptparser testrunner args = do -#ifdef WITH_EKG - _ <- forkServer "localhost" 4242 -#endif - go envmodes +run testoptparser testrunner args = go envmodes where go [] = dispatch True args (cmds testoptparser testrunner) diff --git a/doc/bugs/bind__58___resource_busy___40__Address_already_in_use__41__/comment_3_65488c9eacd5c007151e35504aab92c9._comment b/doc/bugs/bind__58___resource_busy___40__Address_already_in_use__41__/comment_3_65488c9eacd5c007151e35504aab92c9._comment new file mode 100644 index 000000000..51181ad3f --- /dev/null +++ b/doc/bugs/bind__58___resource_busy___40__Address_already_in_use__41__/comment_3_65488c9eacd5c007151e35504aab92c9._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2016-07-06T19:08:10Z" + content=""" +Good greif, gentoo really does enable the ekg build flag. + +Well, I removed the flag, I guess I need to be careful with exposing build +flags that are not for production use if there are distributions that +enable every possible flag willy-nilly. +"""]] diff --git a/git-annex.cabal b/git-annex.cabal index 82eeb68db..872634c9f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -292,10 +292,6 @@ Flag MagicMime Flag ConcurrentOutput Description: Use concurrent-output library -Flag EKG - Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/) - Default: False - Flag Benchmark Description: Enable benchmarking Default: False @@ -470,11 +466,6 @@ Executable git-annex Build-Depends: concurrent-output (>= 1.6) CPP-Options: -DWITH_CONCURRENTOUTPUT - if flag(EKG) - Build-Depends: ekg - GHC-Options: -with-rtsopts=-T - CPP-Options: -DWITH_EKG - if flag(Benchmark) Build-Depends: criterion, deepseq CPP-Options: -DWITH_BENCHMARK |