01/01: gnu: Adjust to PCRE split.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 74c8b174e8015de753ba5cab44f76f944e6fd4ba
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 24 23:54:00 2016 +0200

    gnu: Adjust to PCRE split.
    
    This is a followup to commit 6d49ca3bad613700b539c30272e164207455735b.
    
    * gnu/packages/databases.scm (4store)[inputs]: Remove PCRE.
    [native-inputs]: Add PCRE:bin.
    * gnu/packages/web.scm (httpd): Likewise.
---
 gnu/packages/databases.scm |    2 +-
 gnu/packages/web.scm       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 8a90254..4f2f211 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -86,6 +86,7 @@
        ("automake" ,automake)
        ("gettext" ,gnu-gettext)
        ("libtool" ,libtool)
+       ("pcre" ,pcre "bin")                       ;for 'pcre-config'
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("glib" ,glib)
@@ -94,7 +95,6 @@
        ("raptor2" ,raptor2)
        ("readline" ,readline)
        ("avahi" ,avahi)
-       ("pcre" ,pcre)
        ("cyrus-sasl" ,cyrus-sasl)
        ("openssl" ,openssl)
        ("util-linux" ,util-linux)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 9f36fce..3e145fc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -84,10 +84,10 @@
               (base32
                "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc"))))
     (build-system gnu-build-system)
+    (native-inputs `(("pcre" ,pcre "bin")))       ;for 'pcre-config'
     (inputs `(("apr" ,apr)
               ("apr-util" ,apr-util)
               ("openssl" ,openssl)
-              ("pcre" ,pcre)
               ("perl" ,perl))) ; needed to run bin/apxs
     (arguments
      `(#:test-target "test"