From 00dd2f39ed98aa2690e136182b3bb782b703882a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:12:49 +0000 Subject: pkgs/development/libraries/pcre: updated the meta section and enabled hydra builds of this package svn path=/nixpkgs/trunk/; revision=24069 --- pkgs/development/libraries/pcre/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 3d3385c83f83e..fba3844bf8e45 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -2,19 +2,31 @@ stdenv.mkDerivation { name = "pcre-7.8"; - + src = fetchurl { url = mirror://sourceforge/pcre/pcre-7.8.tar.bz2; sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; - + configureFlags = '' ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; meta = { - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; + license = "BSD-3"; + + longDescription = '' + The PCRE library is a set of functions that implement regular + expression pattern matching using the same syntax and semantics as + Perl 5. PCRE has its own native API, as well as a set of wrapper + functions that correspond to the POSIX regular expression API. The + PCRE library is free, even for building proprietary software. + ''; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } -- cgit 1.4.1 From 5649af8523e2f7ea038fce35fdacf69868a7cc86 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:45:53 +0000 Subject: pkgs/development/libraries/pcre: fixed build on Darwin The gcc version used on Darwin fails to compile the C++ interface to the PCRE library when optimizations are enabled. Building C++ code with -O0 remedies the problem. This is unsatisfactory, though, because the resulting library is likely to perform more poorly than it would if built with -O2 or -O3. svn path=/nixpkgs/trunk/; revision=24072 --- pkgs/development/libraries/pcre/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index fba3844bf8e45..c831f004c121f 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,7 +8,12 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. configureFlags = '' + CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; -- cgit 1.4.1 From dd6e852f3e1afcaf44c456163b1f8cb7ff496d80 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 Oct 2010 13:48:37 +0000 Subject: pkgs/development/libraries/pcre: enable regression test suite svn path=/nixpkgs/trunk/; revision=24074 --- pkgs/development/libraries/pcre/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index c831f004c121f..b30cdb023e2de 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { ${if !cplusplusSupport then "--disable-cpp" else ""} ''; + doCheck = true; + meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; -- cgit 1.4.1 From d845bf6b8cc21fe67642c1db5cbe59ea835ead0f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Oct 2010 13:49:54 +0000 Subject: * Revert last two commits, they should be in the stdenv-branch. svn path=/nixpkgs/trunk/; revision=24075 --- pkgs/development/libraries/pcre/default.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index b30cdb023e2de..fba3844bf8e45 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,18 +8,11 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; - # The compiler on Darwin crashes with an internal error while building the - # C++ interface. Disabling optimizations on that platform remedies the - # problem. In case we ever update the Darwin GCC version, the exception for - # that platform ought to be removed. configureFlags = '' - CPPFLAGS=-NDEBUG CFLAGS=-O3 CXXFLAGS=${if stdenv.isDarwin then "-O0" else "-O3"} ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} ''; - doCheck = true; - meta = { homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; -- cgit 1.4.1 From d095fbb13e4e91a336ef6af6721ef8012b0a928c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Oct 2010 10:29:45 +0000 Subject: pkgs/development/libraries/pcre: fixed build on Darwin The gcc version used on Darwin crashes while compiling the C++ interface of PCRE. Building that code with -O0 avoids the crash. svn path=/nixpkgs/trunk/; revision=24107 --- pkgs/development/libraries/pcre/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index fba3844bf8e45..1dd860aeaeb12 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -8,10 +8,14 @@ stdenv.mkDerivation { sha256 = "1zsqk352mx2zklf9bgpg9d88ckfdssbbbiyslhrycfckw8m3qpvr"; }; + # The compiler on Darwin crashes with an internal error while building the + # C++ interface. Disabling optimizations on that platform remedies the + # problem. In case we ever update the Darwin GCC version, the exception for + # that platform ought to be removed. configureFlags = '' ${if unicodeSupport then "--enable-unicode-properties" else ""} ${if !cplusplusSupport then "--disable-cpp" else ""} - ''; + '' + stdenv.lib.optionalString stdenv.isDarwin "CXXFLAGS=-O0"; meta = { homepage = "http://www.pcre.org/"; -- cgit 1.4.1