branch core-packages-team updated: REMOVEME gnu: Add bdb-4.8-orig to avoid a world rebuild at this time.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch core-packages-team
in repository guix.

The following commit(s) were added to refs/heads/core-packages-team by this 
push:
     new c403e55354 REMOVEME gnu: Add bdb-4.8-orig to avoid a world rebuild at 
this time.
c403e55354 is described below

commit c403e5535415dd27d73f0033ff2b56132506b835
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Dec 11 13:26:49 2024 +0100

    REMOVEME gnu: Add bdb-4.8-orig to avoid a world rebuild at this time.
    
    * gnu/packages/dbm.scm (bdb-4.8-orig): New variable.
    (bdb-5.3): Inherit from it.
    (bdb-6): Likewise.
    
    Change-Id: I14801b2119cc5a7e660df25d141ac082bca0fa87
---
 gnu/packages/dbm.scm | 105 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 93 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm
index 152a8824e1..4a3e455e22 100644
--- a/gnu/packages/dbm.scm
+++ b/gnu/packages/dbm.scm
@@ -146,22 +146,103 @@ SQL, Key/Value, XML/XQuery or Java Object storage for 
their data model.")
     (home-page
      
"http://www.oracle.com/us/products/database/berkeley-db/overview/index.html";)))
 
-(define-public bdb-5.3
-  (package (inherit bdb-4.8)
+(define-public bdb-4.8-orig
+  (package
     (name "bdb")
-    (version "5.3.28")
+    (version "4.8.30")
+    (license (license:non-copyleft "file://LICENSE"
+                                   "See LICENSE in the distribution."))
     (source (origin
-              (inherit (package-source bdb-4.8))
-              (uri (string-append "https://download.oracle.com/berkeley-db/db-";
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"))
-              (patch-flags '("-p0"))
-              (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch"))))))
+             (method url-fetch)
+             (uri (string-append "https://download.oracle.com/berkeley-db/db-";
+                                 version ".tar.gz"))
+             (sha256
+              (base32
+               "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"))
+             (patches (search-patches "bdb-5.3-atomics-on-gcc-9.patch"))
+             (modules '((guix build utils)
+                        (srfi srfi-1)))
+             (snippet bdb-snippet)))
+    (build-system gnu-build-system)
+    (outputs '("out"                             ; programs, libraries, headers
+               "doc"))                           ; 94 MiB of HTML docs
+    (arguments
+     (list #:tests? #f                        ; no check target available
+           #:disallowed-references '("doc")
+           #:out-of-source? #true
+           #:configure-flags
+           #~(list
+              ;; Remove 7 MiB of .a files.
+              "--disable-static"
+
+              ;; The compatibility mode is needed by some packages,
+              ;; notably iproute2.
+              "--enable-compat185"
+
+              ;; The following flag is needed so that the inclusion
+              ;; of db_cxx.h into C++ files works; it leads to
+              ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
+              "--enable-cxx")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'bootstrap
+                 (lambda* (#:key inputs native-inputs outputs
+                           #:allow-other-keys #:rest arguments)
+                   (with-directory-excursion "dist"
+                     (for-each (lambda (x)
+                                 (install-file x "aclocal"))
+                               (find-files "aclocal_java"))
+                     (apply (assq-ref %standard-phases 'bootstrap) arguments)
+                     (let ((automake-files (search-input-directory
+                                            (or native-inputs inputs)
+                                            "share/automake-1.16")))
+                       (define (replace file)
+                         (symlink (string-append automake-files "/" file) 
file))
+                       (for-each replace '("config.sub" "config.guess"
+                                           "install-sh"))))))
+               (add-before 'configure 'pre-configure
+                 (lambda _
+                   (chdir "dist")
+                   ;; '--docdir' is not honored, so we need to patch.
+                   (substitute* "Makefile.in"
+                     (("docdir[[:blank:]]*=.*")
+                      (string-append "docdir = " #$output:doc
+                                     "/share/doc/bdb")))
+                   ;; Replace __EDIT_DB_VERSION__... by actual version numbers.
+                   ;; s_config is responsible for this, but also runs autoconf
+                   ;; again, so patch out the autoconf bits.
+                   (substitute* "s_config"
+                     (("^.*(aclocal|autoconf|autoheader|config\\.hin).*$") "")
+                     (("^.*auto4mte.*$") "")
+                     (("rm (.*) configure") "")
+                     (("chmod (.*) config.guess(.*)$") ""))
+                   (invoke "sh" "s_config"))))))
+    (native-inputs (list autoconf automake-1.16.5 libtool))
+    (synopsis "Berkeley database")
+    (description
+     "Berkeley DB is an embeddable database allowing developers the choice of
+SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
+    ;; Starting with version 6, BDB is distributed under AGPL3. Many individual
+    ;; files are covered by the 3-clause BSD license.
+    (home-page
+     
"http://www.oracle.com/us/products/database/berkeley-db/overview/index.html";)))
+
+(define-public bdb-5.3
+  (package (inherit bdb-4.8-orig)
+           (name "bdb")
+           (version "5.3.28")
+           (source (origin
+                     (inherit (package-source bdb-4.8))
+                     (uri (string-append 
"https://download.oracle.com/berkeley-db/db-";
+                                         version ".tar.gz"))
+                     (sha256
+                      (base32
+                       "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"))
+                     (patch-flags '("-p0"))
+                     (patches (search-patches 
"bdb-5.3-atomics-on-gcc-9.patch"))))))
 
 (define-public bdb-6
-  (package (inherit bdb-4.8)
+  (package (inherit bdb-4.8-orig)
     (name "bdb")
     (version "6.2.32")
     (source (origin