[darcs-devel] darcs patch: Use GHC instead of GCC to check for zlib availability ...
Reinier Lamers
tux_rocker at reinier.de
Wed Apr 30 22:01:57 UTC 2008
Oops. Please disregard this patch. It does not include some amend-
recorded fixes.
Reinier
Op 30-apr-2008, om 23:54 heeft Reinier Lamers het volgende geschreven:
> Tue Apr 29 11:37:41 CEST 2008 tux_rocker at reinier.de
> * Use GHC instead of GCC to check for zlib availability (issue 813)
>
> New patches:
>
> [Use GHC instead of GCC to check for zlib availability (issue 813)
> tux_rocker at reinier.de**20080429093741] hunk ./configure.ac 511
> +dnl Use TRY_COMPILE_GHC and not AC_CHECK_HEADER / AC_CHECK_LIB
> because GHC may
> +dnl use a different library and header than the system GCC (on
> Windows, issue 813)
> hunk ./configure.ac 514
> -AC_CHECK_HEADER(zlib.h, :,
> - AC_MSG_ERROR([Cannot find zlib.h; please set the CPPFLAGS
> environment variable!]))
> -AC_CHECK_LIB(z, gzopen, LIBS="$LIBS -lz",
> - [
> - AC_MSG_ERROR(Cannot find system's zlib library; please set the
> LDFLAGS environment variable!)
> - ])
> +OLDGHCFLAGS="$GHCFLAGS"
> +GHCFLAGS="$GHCFLAGS -lz"
> +AC_MSG_CHECKING([for zlib])
> +TRY_COMPILE_GHC([{-# INCLUDE <zlib.h> #-}
> +{-# OPTIONS_GHC -fglasgow-exts #-}
> +module Main where
> +import Foreign
> +import Foreign.C
> +
> +foreign import ccall unsafe "zlib.h deflate" zlib_deflate :: Ptr
> () -> CInt -> CInt
> +
> +main = putStrLn "hello world"
> +], LIBS="$LIBS -lz", [AC_MSG_ERROR(Cannot find system's zlib
> library; please set the LDFLAGS environment variable!)])
> +GHCFLAGS="$OLDGHCFLAGS"
> +AC_MSG_RESULT([yes])
>
> Context:
>
> [resolve issue76: update docs on temp directory creation.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080430175713]
> [Add test for issue794.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080430165251]
> [doc: encourage new users to use --darcs-2 repositories.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080425172110
> Note that this is sans explanation (in the getting started section).
> Maybe new users might be put off by the mystery flag?
> ]
> [doc: tell users about darcs-2 handling of identical patches.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080425172104
> Do not bother talking about darcs-1 behaviour.
> ]
> [add test for darcs show bug.
> David Roundy <droundy at darcs.net>**20080430165425]
> [fix bug in configure script wrt HTTP package.
> David Roundy <droundy at darcs.net>**20080430165350]
> [cleanup in ShowAuthors: "as" is a bad variable name, since it's
> also a haskell keyword.
> David Roundy <droundy at darcs.net>**20080430161237]
> [add very simple test for show authors.
> David Roundy <droundy at darcs.net>**20080430161222]
> [Ordered.lhs: explain acronyms
> gwern0 at gmail.com**20080429203213]
> [Prefs.lhs: add cabal intermediates to ignore
> gwern0 at gmail.com**20080429201917
> Re-send, not depending on rejected patches.
> ]
> [remove unused function ephemeral.
> David Roundy <droundy at darcs.net>**20080429163057]
> [remove unused compress/uncompress functions.
> David Roundy <droundy at darcs.net>**20080429162552]
> [remove unneeded --verify-hash flag (we always verify hashes).
> David Roundy <droundy at darcs.net>**20080429162303]
> [remove Stringalike module entirely.
> David Roundy <droundy at darcs.net>**20080429155919]
> [cut commented code (that would no longer compile).
> David Roundy <droundy at darcs.net>**20080429155455]
> [eliminate use of Stringalike in ReadMonad and friends.
> David Roundy <droundy at darcs.net>**20080429155158]
> [simplify ParserM
> David Roundy <droundy at darcs.net>**20080429153800]
> [make PatchInfo reading specific to PackedString.
> David Roundy <droundy at darcs.net>**20080429152300]
> [remove unused function test_patch.
> David Roundy <droundy at darcs.net>**20080429150504]
> [remove unused emptyFileContents.
> David Roundy <droundy at darcs.net>**20080429150154]
> [remove unused isExecutable function.
> David Roundy <droundy at darcs.net>**20080429145721]
> [Prefs.lhs: ignore .darcsrepo as well
> gwern0 at gmail.com**20080429012932
> Add it now, since we're going to get .darcsrepo at some point.
> ]
> [Prefs.lhs: ignore zsh-compiled files and Gentoo/X leftover files
> gwern0 at gmail.com**20080429010201]
> [Prefs.lhs: ignore .git
> gwern0 at gmail.com**20080429010115]
> [Prefs.lhs: ignore profiling intermediate files
> gwern0 at gmail.com**20080429010050]
> [Diff.lhs, Prefs.lhs: add docs for 4096 optimization
> gwern0 at gmail.com**20080427234109]
> [Diff.lhs: has_bin only inspects first 4096 characters
> gwern0 at gmail.com**20080427233947
> This is an optimization for large files, it saves running
> has_funky on gigs and gigs of data when pretty much all binary
> files give the truth away within a few characters.
> ]
> [fpstring.c: switch a memchr for memrchr
> gwern0 at gmail.com**20080425200153
> See <http://bugs.darcs.net/issue814>; memrchr speeds up is_funky
> quite a bit and thus helps whatsnew -s. It doesn't seem to break
> (any more) tests.
> ]
> [configure: more precise error messages about packages.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080424120226]
> [SlurpDirectory.lhs: remove apparently pointless aliases
> gwern0 at gmail.com**20080428010950]
> [implement primitive fixing of removal of non-empty files.
> David Roundy <droundy at darcs.net>**20080428165532]
> [add framework for patch-fixing repair.
> David Roundy <droundy at darcs.net>**20080428153041]
> [correct mmap type signatures
> Jason Dagit <dagit at codersbase.com>**20080428190837]
> [grammar fix
> Ferenc Wagner <wferi at niif.hu>**20080426173243]
> [add checks for removal of non-empty files.
> David Roundy <droundy at darcs.net>**20080426120904]
> [remove git section from building_darcs.tex
> David Roundy <droundy at darcs.net>**20080424134245
> Thanks to Nicolas Pouillard for pointing this out.
> ]
> [clean up genslurp_helper a tad.
> David Roundy <droundy at darcs.net>**20080423214457
> I'm removing an unneeded unsafeInterleaveIO and am reformatting
> some of the
> indentation to make it clearer which else goes with which if.
> ]
> [remove unneeded redundant adding of -lcurses (done by
> AC_SEARCH_LIBS).
> David Roundy <droundy at darcs.net>**20080423214404]
> [simplify configure a bit: if we're defining CPP symbols, no need
> to also use AC_SUBST.
> David Roundy <droundy at darcs.net>**20080423152121]
> [simplify makefile a bit.
> David Roundy <droundy at darcs.net>**20080423150529]
> [Give a clear error message when no suitable haddock is installed
> tux_rocker at reinier.de**20080423172834]
> [give proper error message when slurping fails to identify a file
> or directory.
> David Roundy <droundy at darcs.net>**20080423141737]
> [default to not coloring hunks.
> David Roundy <droundy at darcs.net>**20080423141725]
> [Use the lineColoring to prettify hunks with colors.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420135252]
> [Add line coloring support in Printer and ColourPrinter.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420135238]
> [Export Printer.(<?>).
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420135208]
> [Add two colors (cyan and magenta), but not use them yet.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420122811]
> [Refactor a little the color handling.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420122500]
> [slim down the makefile based on Gwern's changes to the configure
> script.
> David Roundy <droundy at darcs.net>**20080423131854]
> [configure.ac: export -lcurses for cabal
> gwern0 at gmail.com**20080420221056]
> [configure.ac: export Curses as well
> gwern0 at gmail.com**20080420214353]
> [Little style change.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080420122143]
> [Define unDoc as field of Doc.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080416075954]
> [Replace colour by color to uniformise a bit.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080416074742]
> [Canonize G. Branwen, P. Rockai, L. Komolodin and R. Lamers.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080422152346
> All anonymous patches get assigned to Gwern.
> ]
> [doc tweak
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080422151420]
> [resolve issue809: doc: darcs get is not lazy by default.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080422150809]
> [doc: darcs-2 is no longer experimental.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080422150736]
> [Rename ColourPrinter to ColorPrinter.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421154043
> We might as well standardize on American spelling in the code.
> ]
> [eliminate duplicate get_remote_repo in favor of list comprehensions.
> David Roundy <droundy at darcs.net>**20080421145642]
> [resolve issue792: Account for --remote-repo in defaultrepo code
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421144023]
> [Extend command_argdefaults to accept [DarcsFlag].
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421143950]
> [Add a --remote-repodir flag (yet unused).
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421134352]
> [Account for pre-existing api-doc.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421135155]
> [Create the api-doc dir if it does not exist.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421134800]
> [replace '{-# OPTIONS' with '{-# OPTIONS_GHC'
> gwern0 at gmail.com**20080419024027
> These OPTIONS pragmas use GHC-isms; best practice is to make them
> GHC specific if they are GHC specific.
> Specifically: -fglasgow-exts is obviously GHC only. -cpp is used
> only by GHC AFAIK - hugs uses some hugscpp, YHC uses '--cpp' as
> does presumably NHC, JHC doesn't support cpp, and no idea about the
> others.
> However, this patch omits modifying "src/Darcs/ColourPrinter.lhs",
> "src/Workaround.hs", and "src/win32/CtrlC.hs" because I was
> uncertain whether '-fno-warn-orphans', '-w', and '-ffi' are
> actually GHC-only.
> ]
> [configure.ac: export -DHAVE_LIBWWW for CPP
> gwern0 at gmail.com**20080420213108]
> [resolve issue795: Make 'darcs changes -i' behave more like other
> jobs.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421105247
>
> Old behaviour:
> Shall I continue to view changes?
> y - do not view this patch; keep going [DEFAULT]
> n - quit
> v - view this patch; keep going
> q - quit
>
> New behaviour:
> Shall I view this patch?
> y - view this patch; keep going
> n - do not view this patch; keep going [DEFAULT]
> v - view this patch; keep going
> q - quit
> ]
> [Undo a false refactor in SelectChanges.
> Eric Kow <E.Y.Kow at brighton.ac.uk>**20080421104106
>
> The new old code makes it clearer that text_view is only used by
> 'view changes'
> ]
> [Fix pluralization of patches using English module.
> David Roundy <droundy at darcs.net>**20080421121716]
> [configure.ac: move HAVE_CURL around
> gwern0 at gmail.com**20080420220800
> The dependency was inverted; we want to set HAVE_CURL before we
> test for Curl pipelining.
> ]
> [stringify.hs: rw to avoid multi-line string literal
> gwern0 at gmail.com**20080419025648
> The reason we want to avoid multi-line string literals is because
> GHC and CPP can break them quite badly if accidentally applied.
> In addition, no one is going to read Context.hs - it exists solely
> to be compiled. So removing the multi-line business in favor of one
> long string which will look exactly the same in the compiled binary
> causes no problems. And it can fix a big one - if Context.hs can't
> be compiled, obviously Darcs cannot.
> ]
> [configure.ac: restructure curl
> gwern0 at gmail.com**20080419020619
> We want to make sure HAVE_CURL shows up in CPP flags.
> ]
> [configure.ac: +mention why threaded is not default/doc
> gwern0 at gmail.com**20080420023752]
> [optimized get --to-match handling for darcs 1 repositories
> tux_rocker at reinier.de**20080420152608]
> [rearrange bytestring tests so if it's not present we're quieter.
> David Roundy <droundy at darcs.net>**20080418212319]
> [configure.ac: fix bytestring checking
> gwern0 at gmail.com**20080418205704
> This changes bytestring to be default. However it checks twice: if
> either --disable-bytestring is set or bytestring can't be found, it
> won't pass on CPP -DHAVE_BYTESTRING. So this should work for Dr.
> Roundy's lack of bytestring.
> ]
> [remove unneeded check for termio.h.
> David Roundy <droundy at darcs.net>**20080417172427]
> [configure.ac: rm line
> gwern0 at gmail.com**20080416184604
> I can't even figure out how long ago Control.Monad was in a 'util'
> package.
> ]
> [we don't need Darcs.Patch.Check for darcs itself.
> David Roundy <droundy at darcs.net>**20080417150720]
> [remove hackish attempt to set GC parameters based on available
> memory.
> David Roundy <droundy at darcs.net>**20080416164105]
> [define forM_ since it is absent on GHC 6.4.1
> zooko at zooko.com**20080409234512]
> [make darcs build on win32 by conditionally compiling out a few
> bits that are unused or meaningless on win32
> zooko at zooko.com**20080410204830]
> [Don't let other configure flags change the type witnesses
> Lennart Kolmodin <kolmodin at gentoo.org>**20080415210614
> For example, when using --with-docs the type witnesses would be
> turned on,
> while with --without-docs they would not. This patch adresses this
> issue.
> ]
> [eliminate use of Haskell 98 library modules.
> David Roundy <droundy at darcs.net>**20080415214217]
> [add type witness declarations to Resolution
> David Roundy <droundy at darcs.net>**20080415165457]
> [move -cpp option into source files.
> David Roundy <droundy at darcs.net>**20080415144719]
> [Issue a warning when using --old-fashioned-inventory with a
> darcs-2 repository.
> Nicolas Pouillard <nicolas.pouillard at gmail.com>**20080414232715]
> [FastPackedString.hs: FastPackedString.hs: redefine linePS/unlinesPS
> gwern0 at gmail.com**20080414150839
> Turns out that my definitions were wrong - they differed and added
> a newline where the old FPS versions didn't. So I've rewritten the
> wrapper versions around ByteString, and checked them against the
> old ones with QuickCheck. With these fixes, a bytestring darcs
> seems to pass all the tests as a fps darcs.
> ]
> [remove unused Setup.lhs.
> David Roundy <droundy at darcs.net>**20080414190738]
> [roll back implementation of joke oops command.
> David Roundy <droundy at darcs.net>**20080414133342
> Apparently it didn't actually work...
>
> rolling back:
>
> Tue Apr 8 07:58:56 PDT 2008 David Roundy <droundy at darcs.net>
> * resolve issue786: implement oops command.
>
> M ./src/Darcs/Commands/Tag.lhs -5 +47
> M ./src/Darcs/TheCommands.lhs -1 +2
> ]
> [just remove concatLenPS
> David Roundy <droundy at darcs.net>**20080411205303
> It is never used in a performance-critical situation, so I'm
> voting to just
> trash it. I'd rather have fewer unsafe operations.
> ]
> [FastPackedString.hs: simplify concatLenPS, although this removes
> its strictness properties
> **20080411035327]
> [FastPackedString.hs: remove wfindPS
> **20080411035046
> With better imports from bytestring, I believe it to be
> superfluous, and dangerous to leave around.
> ]
> [FastPackedString.hs: grmmr/sp
> **20080411034730]
> [FastPackedString.hs: rw linesPS using ByteString split
> **20080411032229]
> [doc updates
> gwern0 at gmail.com**20080409170824
> Convert all uses of 'http://darcs.net/repos/stable' to just
> darcs.net, since unstable and stable were merged together, and the
> old URL is a 404 for darcs getting. This is a real problem, see for
> example <http://reddit.com/info/6ewbq/comments/c03o6d5>.
> ]
> [fix typo in show_bug_help
> Matyas Janos <mjanos5 at gmail.com>**20080408232600]
> [Raise a configure error when no Text.Regex module can be found.
> nicolas.pouillard at gmail.com**20080409085522]
> [update README url links
> gwern0 at gmail.com**20080407201333]
> [add a bit more debugging info to repository identification.
> David Roundy <droundy at darcs.net>**20080408151912]
> [resolve issue385: don't worry if we can't get local changes.
> David Roundy <droundy at darcs.net>**20080408151823]
> [add test for issue385.
> David Roundy <droundy at darcs.net>**20080408151808]
> [resolve issue786: implement oops command.
> David Roundy <droundy at darcs.net>**20080408145856]
> [fix URL in network test.
> David Roundy <droundy at darcs.net>**20080408145407]
> [fix manual bug.
> David Roundy <droundy at darcs.net>**20080407191736]
> [add new show bug command (hidden) to see what darcs will report if
> we encounter a bug.
> David Roundy <droundy at darcs.net>**20080407175410]
> [automatically work out the version of the stable release.
> David Roundy <droundy at darcs.net>**20080407171850]
> [set prefs again (they got lost on convert).
> David Roundy <droundy at darcs.net>**20080407171559]
> [update darcs repository URL.
> David Roundy <droundy at darcs.net>**20080407164601]
> [fix up website for new release.
> David Roundy <droundy at darcs.net>**20080407164010]
> [simplify determine_release_state.pl.
> David Roundy <droundy at darcs.net>**20080407153000]
> [make determine_release_state.pl use changes --count.
> David Roundy <droundy at darcs.net>**20080407152347]
> [add --count output option to changes.
> David Roundy <droundy at darcs.net>**20080407151825]
> [TAG 2.0.0
> David Roundy <droundy at darcs.net>**20080407150638]
> Patch bundle hash:
> 80696677d5a32e8fd64e0a1b8ff7d4cd415db35a
> _______________________________________________
> darcs-devel mailing list (AUTOMATIC POSTINGS ONLY PLEASE!)
> darcs-devel at darcs.net
> http://lists.osuosl.org/mailman/listinfo/darcs-devel
More information about the darcs-devel
mailing list