public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pcre/cross: Enable support for winpthreads.

Browse Source 
That way we're able to build with the JIT compiler enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-02-24 05:01:29 +01:00
parent 44cfba7950
commit d0142e9b09
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/pcre/default.nix
View File

@ -1,4 +1,8 @@
{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true }: { stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true
, windows ? null
}:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pcre-8.34"; name = "pcre-8.34";
@ -16,12 +20,16 @@ stdenv.mkDerivation rec {
--enable-jit --enable-jit
${if unicodeSupport then "--enable-unicode-properties" else ""} ${if unicodeSupport then "--enable-unicode-properties" else ""}
${if !cplusplusSupport then "--disable-cpp" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""}
'' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; '' + optionalString stdenv.isDarwin "CXXFLAGS=-O0";
doCheck = with stdenv; !(isCygwin || isFreeBSD); doCheck = with stdenv; !(isCygwin || isFreeBSD);
# XXX: test failure on Cygwin # XXX: test failure on Cygwin
# we are running out of stack on both freeBSDs on Hydra # we are running out of stack on both freeBSDs on Hydra
crossAttrs = optionalAttrs (stdenv.cross.config == "x86_64-w64-mingw32") {
buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
};
meta = { meta = {
homepage = "http://www.pcre.org/"; homepage = "http://www.pcre.org/";
description = "A library for Perl Compatible Regular Expressions"; description = "A library for Perl Compatible Regular Expressions";
@ -35,7 +43,7 @@ stdenv.mkDerivation rec {
PCRE library is free, even for building proprietary software. PCRE library is free, even for building proprietary software.
''; '';
platforms = stdenv.lib.platforms.all; platforms = platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = [ maintainers.simons ];
}; };
} }