guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: mongodb: Fix build.


From: guix-commits
Subject: 01/01: gnu: mongodb: Fix build.
Date: Tue, 22 Oct 2019 02:27:34 -0400 (EDT)

cbaines pushed a commit to branch master
in repository guix.

commit 9d67480adf0d4cbfe82183f949065c8be1e39882
Author: Christopher Baines <address@hidden>
Date:   Tue Oct 22 07:23:07 2019 +0100

    gnu: mongodb: Fix build.
    
    * gnu/packages/databases.scm (mongodb)[inputs]: Use openssl 1, as 1.1. 
doesn't
    work.
    [arguments]: Change how a constant is defined in the tests to allow 
compiling
    with a newer version of GCC.
---
 gnu/packages/databases.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index bfed9df..5c9435a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -498,7 +498,7 @@ replacement for the code@{python-memcached} library.")
                 (search-patch 
"mongodb-support-unknown-linux-distributions.patch")))))
     (build-system scons-build-system)
     (inputs
-     `(("openssl" ,openssl)
+     `(("openssl" ,openssl-1.0)
        ("pcre" ,pcre)
         ,@(match (%current-system)
             ((or "x86_64-linux" "aarch64-linux" "mips64el-linux")
@@ -538,6 +538,15 @@ replacement for the code@{python-memcached} library.")
                 ,(format #f "--jobs=~a" (parallel-job-count))
                 "--ssl")))
          (modify-phases %standard-phases
+           (add-after 'unpack 'patch
+             (lambda _
+               ;; Remove use of GNU extensions in parse_number_test.cpp, to
+               ;; allow compiling with GCC 7 or later
+               ;; https://jira.mongodb.org/browse/SERVER-28063
+               (substitute* "src/mongo/base/parse_number_test.cpp"
+                 (("0xabcab\\.defdefP-10")
+                  "687.16784283419838"))
+               #t))
            (add-after 'unpack 'scons-propagate-environment
              (lambda _
                ;; Modify the SConstruct file to arrange for



reply via email to

[Prev in Thread] Current Thread [Next in Thread]