From unknown Fri Jun 13 10:35:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#32221 <32221@debbugs.gnu.org> To: bug#32221 <32221@debbugs.gnu.org> Subject: Status: [PATCH 0/5] MariaDB updates Reply-To: bug#32221 <32221@debbugs.gnu.org> Date: Fri, 13 Jun 2025 17:35:50 +0000 retitle 32221 [PATCH 0/5] MariaDB updates reassign 32221 guix-patches submitter 32221 Marius Bakke severity 32221 normal tag 32221 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:36:10 2018 Received: (at submit) by debbugs.gnu.org; 20 Jul 2018 11:36:10 +0000 Received: from localhost ([127.0.0.1]:48865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgThh-0007KV-Rn for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:36:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgThg-0007KF-NR for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:36:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgTha-0000GR-JU for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:36:03 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_20,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:59310) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgTha-0000GN-FK for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:36:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fgThZ-0001pQ-Ca for guix-patches@gnu.org; Fri, 20 Jul 2018 07:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fgThW-0000EK-8X for guix-patches@gnu.org; Fri, 20 Jul 2018 07:36:01 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55911) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fgThW-0000DM-0K for guix-patches@gnu.org; Fri, 20 Jul 2018 07:35:58 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 6618221D6D for ; Fri, 20 Jul 2018 07:35:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:35:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=tfxAVlrRTM3TL1DccG2kaaSe2REi0p5qgbRBISYI/ dw=; b=dBJPpa1WvKIIpsFIfL73Ws8KQGMbF4fhWtiPdQVSN/UNGPdJGkXTtxRfk UN/fygxLh/aVo7nNwosfvtQYhw6i7ayN9wlipes1Ep18YML72T2TbzRVets/rlw5 zSFvXzutWAki/wJQF6W27Wbl7602203pG8iwPPdACbSxSVLvqeKhRtIk8ba5f2Ae 4kVotR9yPA+Q6GsNYVZA+jP8pZYfPRRXe162NAMlROkVuDI4TtrLh1bgbwv6oBsU S2QqEC95d2cPFODX35w7Il608HzQBVWz6Rb55K+98OlDT+CYcuh7yxJqCXrSKJwY /ldZo065F9JZOeUHG7gTy9za4jbFQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=tfxAVlrRTM3TL1Dcc G2kaaSe2REi0p5qgbRBISYI/dw=; b=cP37a3gZoYsVghenQaKSPXgVH0mHI4qS2 KUoSrY8gxbo57AvM+pVUEbJRY9Z0tO8Jn4kJGSq9OOPCtJX5nGehFHWsSPojQ+c/ ykC17oY4GzhFREztJ55EH0HKbhgJMVBKENmzhfB03YAQXkGnD9HrrUwxlq5JR+3p SyD4CUKEUH63goGTeQjik6qskwPncEGila32pL28IwATiASNlKfnSOlyONNoPmcl Qd9AYxWqkzyg0YHF59nbYCYmT9WbnxtQFrYkvIutUauX9duwxJTHRmwC9yywwLqy Klvfjf0XPQrP8OB7jBEq7e2iSX1NiDTSVcQd/1wbP9fZhElTzuEdg== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id C912610268 for ; Fri, 20 Jul 2018 07:35:55 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH 0/5] MariaDB updates Date: Fri, 20 Jul 2018 13:35:53 +0200 Message-Id: <20180720113553.18138-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.3 (-----) These patches gives us more control of the MariaDB package. In particular, we now invoke the test runner directly, so we can pass custom arguments; there's a phase for disabling plugins in an attempt to fix the armhf build; we now use system zlib, pcre, xz and snappy; and the package is ~37 MiB smaller thanks to a new "static" output. I've verified that 'qtbase' builds against this MariaDB. Marius Bakke (5): gnu: mariadb: Disable plugin that fails on armhf. gnu: mariadb: Run the full test suite. gnu: mariadb: Update to 10.1.34. gnu: mariadb: Remove some bundled libraries. gnu: mariadb: Move static libraries to separate output. gnu/packages/databases.scm | 104 ++++++++++++++++++++++++++++++++++--- 1 file changed, 97 insertions(+), 7 deletions(-) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:38:42 2018 Received: (at 32221) by debbugs.gnu.org; 20 Jul 2018 11:38:42 +0000 Received: from localhost ([127.0.0.1]:48875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkA-0007PF-Be for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:42 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTk8-0007P1-3P for 32221@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:40 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9855D21D46 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:39 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:38:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:message-id:subject:to:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=5xPTb4dVbRozJX5IcOdnDiSjbE7yaGYoaLLPzKMVF 8s=; b=HOF37wUtsBLEFerNBkI/IrrldEAjrFsC0OF4fIf2BHAcvO26lWvj1XeTW ARSYRPbpPiRXUfXd4RIy5J5NEkXAFnXcnmq9fnhr9giPxBQKZvC5CED5PAx6BuUW p9wcCURBM8JXx9yx5TVtxlAzHBO4LOwJ7xiH3PAX0l9y+SOvcw8Am0YNN43EKoXA +uVMTmo1ygBKi/EOAdNuKZbBHO2dMUGY1nX/kWhOublP0DHTByexk9RS2vKoaaIh OnPvnd7dXO30mvXjaXkIclf/4fm5ZWfEHm/IgI1a+DdJuYivcH9QFz7XKfFuK/jw B0TQZGsR6dVL96O67v9D4iOZ6lrmQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=5xPTb4dVbRozJX5Ic OdnDiSjbE7yaGYoaLLPzKMVF8s=; b=nM8QUhuCGAGLIwMkfmNWNaDrLccBq1vS4 WxBj+SQCHc9Im6oUdtYK3QKMIkZoe0muk3Dnwb2bubirA2yy2JkxemmtoXanPq1v +BVpdcjyONQRZ+eiXqIygc/byLBCu0Bph23Hi0Vyen9yfQjdA7UW422WWcsBBSOD +MnR/BvESuePSnZn4MN5cf+j5TIZxO+SgOJum6AmwhbEBz0fMevPeghzDOiT4En5 0fTbtCX4/a4xaHcs5qEWWOtlgVOowNQhIfpQSL2NphbN717WcY7RlRv3oKT5/JfL 6DQXjPoNITSnT2VRdOYjKUrmRNyxcTAxCpvv71oaCRDM88uLLuwCQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id EB71610269 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:38 -0400 (EDT) From: Marius Bakke To: 32221@debbugs.gnu.org Subject: [PATCH 1/5] gnu: mariadb: Disable plugin that fails on armhf. Date: Fri, 20 Jul 2018 13:38:33 +0200 Message-Id: <20180720113837.29412-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/databases.scm (mariadb)[arguments]: Add 'disable-plugins' phase. --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index b9ae9ee15..c27381ac2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,19 @@ Language.") "-DINSTALL_SHAREDIR=share/mysql") #:phases (modify-phases %standard-phases + (add-before 'configure 'disable-plugins + (lambda _ + (let ((disable-plugin (lambda (name) + (call-with-output-file + (string-append "plugin/" name + "/CMakeLists.txt") + (lambda (port) + (format port "\n"))))) + (disabled-plugins '(;; FIXME: On armhf-linux, this plugin + ;; triggers a GCC ICE. Disable for now. + "semisync"))) + (for-each disable-plugin disabled-plugins) + #t))) (add-before 'configure 'pre-configure (lambda _ -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:38:45 2018 Received: (at 32221) by debbugs.gnu.org; 20 Jul 2018 11:38:45 +0000 Received: from localhost ([127.0.0.1]:48880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkC-0007PX-Nw for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:45 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:59555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTk9-0007P8-B9 for 32221@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:41 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3977921D46 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:41 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:38:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=XtW75qCnxvq68iJ4i hdoXMJaS7dx2RlKpHBeB+jMQNg=; b=N1O1r3O5bGFumGSb+TFFUGzCZlMqzST3z vbO3Ev4Rfo9AmPwImQWH++VI8Tz+VdXWiuDbveHUHatXka2q4fzdSRh4KpNWkngn Uwz2vcaUgAN8KAbgRdT/XmF5AQLBMbStTv+oW3fEyrhGz7Yy7vmuD4GdhZo2hB+M 4kr6ovvpQU3pokILjNLnkObAsy9ve/1xYjdJrbTTxkhjkHofWKmFKvItfncIevKd IzTXKgh+h2aq+zZMOOdAd3lj0HL4lwm2MBF20x/vZAFr9e2Fvn7FXnRxN/eA3H+j IQG5MrdNn2eS2V1O4dRosXCC62bpjMyZuVueSnvzuhdbrwx2V6YVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=XtW75qCnxvq68iJ4ihdoXMJaS7dx2RlKpHBeB+jMQNg=; b=VCeaoS2Z oXwwmCE4i4ztUzdpclanGcvdT3zu/s8uZLFXSMduIO/iOTruy4tHLcuUEMHZwVes qz5CGewjRumyiv9qwlo8IL3RdwYFnFXRYvv41I879gZkTz03jnxB1G9pDg4YxANT CcmE3Z+q/YUis0Ypzy1RjV3bFJkDaAQd5p4umB+XPxXADVFCbYP3O9MUoBQd8//3 eLl+B8z4R+d1m3NMA2KogfhSoYGi4E3pKW7SZ405TUoX8kGG6g1yyufaMZg+0NTK fFegl4hEaN0QNVLAMRkx5iejHetEBGaa/WlsJnHzl3N+H8xamrgekKeR4EAJzDIA yZdae/SS62sGcw== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id 9FC271025D for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:40 -0400 (EDT) From: Marius Bakke To: 32221@debbugs.gnu.org Subject: [PATCH 2/5] gnu: mariadb: Run the full test suite. Date: Fri, 20 Jul 2018 13:38:34 +0200 Message-Id: <20180720113837.29412-2-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720113837.29412-1-mbakke@fastmail.com> References: <20180720113837.29412-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/databases.scm (mariadb)[arguments]: Override 'check' phase. Add phase 'adjust-tests'. Disable one more plugin. [properties]: New field. --- gnu/packages/databases.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c27381ac2..9e4adc340 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -665,6 +665,29 @@ Language.") "-DINSTALL_SHAREDIR=share/mysql") #:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-tests + (lambda _ + (let ((disabled-tests + '(;; These fail because root@hostname == root@localhost in + ;; the build environment, causing a user count mismatch. + ;; See . + "main.join_cache" + "main.explain_non_select" + "roles.acl_statistics")) + + ;; This file contains a list of known-flaky tests for this + ;; release. Append our own list. + (unstable-tests (open-file "mysql-test/unstable-tests" "a"))) + (for-each (lambda (test) + (format unstable-tests "~a : ~a\n" + test "Disabled in Guix")) + disabled-tests) + (close-port unstable-tests) + + (substitute* "mysql-test/mysql-test-run.pl" + (("/bin/ls") (which "ls")) + (("/bin/sh") (which "sh"))) + #t))) (add-before 'configure 'disable-plugins (lambda _ (let ((disable-plugin (lambda (name) @@ -675,7 +698,9 @@ Language.") (format port "\n"))))) (disabled-plugins '(;; FIXME: On armhf-linux, this plugin ;; triggers a GCC ICE. Disable for now. - "semisync"))) + "semisync" + ;; XXX: Causes a test failure. + "disks"))) (for-each disable-plugin disabled-plugins) #t))) (add-before @@ -683,6 +708,11 @@ Language.") (lambda _ (setenv "CONFIG_SHELL" (which "sh")) #t)) + (replace 'check + (lambda _ + (with-directory-excursion "mysql-test" + (invoke "./mtr" "--parallel" (number->string (parallel-job-count)) + "--verbose" "--skip-test-list=unstable-tests")))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) @@ -708,6 +738,9 @@ Language.") ("openssl" ,openssl) ("pcre" ,pcre) ("zlib" ,zlib))) + ;; The test suite is very resource intensive and can take more than three + ;; hours on a x86_64 system. Give slow and busy machines some leeway. + (properties '((timeout . 43200))) ;12 hours (home-page "https://mariadb.org/") (synopsis "SQL database server") (description -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:38:45 2018 Received: (at 32221) by debbugs.gnu.org; 20 Jul 2018 11:38:45 +0000 Received: from localhost ([127.0.0.1]:48885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkD-0007Pa-3s for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:45 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:60813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkB-0007PP-5i for 32221@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:43 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E982F21B84 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:42 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:38:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=WA6sngirmUNe6JuIO BI4imjI/sJy4HZalhx5IS4YOtY=; b=FNTWdHzaPc+legt46xotpezUkYX4DlVWa xnYmjKm2ePuroC2890sktbcxHP7z6Tgk8W4d0a/Lcwurn5I4g3bSacOnOT8h7Cqv Z4dKKFVXN1fh6YETJwDVYmJDNJHr9UqACRfGD1ODLmcSb5pkiOVB/lM0sIuBiLeW 29HjCJkpbe1xT80Xm8Qxa9tSLKY0eL2xIrBqPK56++l2ZqevTEZ0aYzkW7K/FmUe 8qFfY3rahXvihPO3uskrfqfkNrey+aRqkRnpBdz5fyli7MMMkmFvy0RUBglk4dl9 mOn2pQ0l1oONq1XLXqy5cwkpF6kFCQL3YiJGhTIqsp16uVDl8wAxw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=WA6sngirmUNe6JuIOBI4imjI/sJy4HZalhx5IS4YOtY=; b=qCdGh5QY gDIdYjqjs6M3qNDCHXK8dWwddMhvcrUB4Ed8YWtkOuwkdZL5YzXRQVLDvZfseO66 sbvzpVbIIB/Hnmiq8qvLl5YKGBvEnRJSeh0r+Hos5nRlSKapuPo/grYmQjRRYq7d 1qV45BloI57GXEKKLva+Pqr62QHjD4zRcRuj9NkxF835aeaFozt/M8oUPVmcPJm6 ZlWY1au2K4Y3AEtTTwuHGBfs1G6hY9o7gEnbM2ahl1bt69TBUfW6Bcgsj2TJPS62 ODq5vhwtk2ZyO9NGQSA0R7E3w9Wd8F8aoQgZS79ovfk8X8VzFvAIDx2eA991qtgY hJw8F3BlTUT1/w== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id 623671025C for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:42 -0400 (EDT) From: Marius Bakke To: 32221@debbugs.gnu.org Subject: [PATCH 3/5] gnu: mariadb: Update to 10.1.34. Date: Fri, 20 Jul 2018 13:38:35 +0200 Message-Id: <20180720113837.29412-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720113837.29412-1-mbakke@fastmail.com> References: <20180720113837.29412-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/databases.scm (mariadb): Update to 10.1.34. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9e4adc340..3b767664a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -627,7 +627,7 @@ Language.") (define-public mariadb (package (name "mariadb") - (version "10.1.33") + (version "10.1.34") (source (origin (method url-fetch) (uri (string-append "https://downloads.mariadb.org/f/" @@ -635,7 +635,7 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0bax748j4srsyhw5cs5jvwigndh0zwmf4r2cjvhja31ckx8jqccl")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:38:49 2018 Received: (at 32221) by debbugs.gnu.org; 20 Jul 2018 11:38:49 +0000 Received: from localhost ([127.0.0.1]:48890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkG-0007Q4-GL for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:48 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:34797) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkC-0007PW-O9 for 32221@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:45 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9C5B721D46 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:44 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:38:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=6nWgac9Co/LvN0NPC 6XnFhMxWSpgYbWeyY2U51Uca7s=; b=sA/uAXft9zj7JPDZBjkdLauw/lEVA2CLy +R7A83OOuH493cCvYsYc0+oRt5XfxB9dKv8bzY3eVd7iue8D0AFuXlNj9zLErdNj WkAwTxqRKQFIo1u68nQZKRVeUsQF2VkaJZE7F2QYjdBlkIzlzv+YP97po28+oBkt 7P55lXkkQ/HCStI45nEb3VTw08IPAxeRqTrHrr7285SaUhToovfTdhwA/H6xM3Fp +VPKBhvh2IqpE2OC+fz0DTTJdfBuRP2RWyw+Fify7UhxSIQKqo5i3jxI8x8hpvcb sQVxPbuZxR/IuqlFEwf1zJYu9gUtfsv1aCWVVSXdij6uiJzefJUlg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=6nWgac9Co/LvN0NPC6XnFhMxWSpgYbWeyY2U51Uca7s=; b=MZDUViOj C4UYq7yB8AJg9Fg1BaU6rr8UF7iRCFnfRa0w/OZWlDcRN5CeHDTj2ry1N5RYOG/S xOOkKpPOJ4P6K5TjWtDGIhgAlb3tqj/du5NfCq4e5I0EvuibOBsd3yKnfehrtzYx jUmV3y3Er+l7CnBwdkGLA84qQKOcbKJD/nMJEgkjiH5BKsXPHlrfopnN7/o8to0R qVP3UNV/tKqvS+yec4QC3G1wG7QotOijO/vUb2RowL/qJatUcfb51qAbBcgm62J+ wkzIjbZAmXrEiGctB7SjnezzySguHTB+tgtDb2dADX7JuU+mSFLl6WiCbr7jX4IA /uBLh9scue2F/w== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id 034F71025D for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:43 -0400 (EDT) From: Marius Bakke To: 32221@debbugs.gnu.org Subject: [PATCH 4/5] gnu: mariadb: Remove some bundled libraries. Date: Fri, 20 Jul 2018 13:38:36 +0200 Message-Id: <20180720113837.29412-4-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720113837.29412-1-mbakke@fastmail.com> References: <20180720113837.29412-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/databases.scm (mariadb)[source](snippet, modules): New fields. [arguments]: Add explicit #:configure-flags for system libraries. Add 'unbundle' phase. Remove 'pre-configure' phase. [inputs]: Add SNAPPY and XZ. --- gnu/packages/databases.scm | 43 ++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3b767664a..de1db2f93 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -635,7 +635,16 @@ Language.") name "-" version ".tar.gz")) (sha256 (base32 - "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")))) + "0j2mdpyvj41vkq2rwrzky88b7170hzz6gy2vb2bc1447s2gp3q67")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "storage/tokudb/PerconaFT/third_party") + (for-each (lambda (file) + (unless (string-suffix? "CMakeLists.txt" file) + (delete-file file))) + (append (find-files "pcre") (find-files "zlib"))) + #t)))) (build-system cmake-build-system) (arguments '(#:configure-flags @@ -649,6 +658,11 @@ Language.") ;; For now, disable the features that that use libarchive (xtrabackup). "-DWITH_LIBARCHIVE=OFF" + ;; Ensure the system libraries are used. + "-DWITH_JEMALLOC=yes" + "-DWITH_PCRE=system" + "-DWITH_ZLIB=system" + "-DDEFAULT_CHARSET=utf8" "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -665,6 +679,26 @@ Language.") "-DINSTALL_SHAREDIR=share/mysql") #:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle + (lambda _ + ;; The bundled PCRE in MariaDB has a patch that was upstreamed + ;; in version 8.34. Unfortunately the upstream patch behaves + ;; slightly differently and the build system fails to detect it. + ;; See . + ;; XXX: Consider patching PCRE instead. + (substitute* "cmake/pcre.cmake" + ((" OR NOT PCRE_STACK_SIZE_OK") "")) + + (substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt" + ;; Remove dependency on these CMake targets. + ((" build_lzma build_snappy") "")) + + (substitute* "storage/tokudb/PerconaFT/CMakeLists.txt" + ;; This file checks that the bundled sources are present and + ;; declares build procedures for them. We don't need that. + (("^include\\(TokuThirdParty\\)") "")) + + #t)) (add-after 'unpack 'adjust-tests (lambda _ (let ((disabled-tests @@ -703,11 +737,6 @@ Language.") "disks"))) (for-each disable-plugin disabled-plugins) #t))) - (add-before - 'configure 'pre-configure - (lambda _ - (setenv "CONFIG_SHELL" (which "sh")) - #t)) (replace 'check (lambda _ (with-directory-excursion "mysql-test" @@ -737,6 +766,8 @@ Language.") ("ncurses" ,ncurses) ("openssl" ,openssl) ("pcre" ,pcre) + ("snappy" ,snappy) + ("xz" ,xz) ("zlib" ,zlib))) ;; The test suite is very resource intensive and can take more than three ;; hours on a x86_64 system. Give slow and busy machines some leeway. -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 20 07:38:49 2018 Received: (at 32221) by debbugs.gnu.org; 20 Jul 2018 11:38:49 +0000 Received: from localhost ([127.0.0.1]:48892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkG-0007Q6-Vh for submit@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:49 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:52921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fgTkE-0007Ps-8A for 32221@debbugs.gnu.org; Fri, 20 Jul 2018 07:38:46 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 22F3121B84 for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 20 Jul 2018 07:38:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=DAM1HfnceDXwI1mL8 0Kpj8kwQYNN9MS58O7eMd1qEt0=; b=EUR7DWPSF5Wo/LxGQR2TNmuVK0PV+yiIq bnWn037u33MnIPfXRf7QjrLzmY1ZZ5grQykyFFFMV6tf6RHehwDl587uTX9uYleq nP90Os+NGPz6mIUY7RUERox9f3PHsA88d04peJSOpNPQ7CjNrMU/a4pO4XTHhtdp VHunWOFA1W2/yu+5yqgjylvZAtjpX+t4Ht/GAnZfVNz+OnHcPwsrQ12n6cpmo0z5 9BMnvbyJ+Eu4ycL3KkSLNOZWJtR2tUw95sUKNWnHNPXS0kt1Xnn7WT5V9OQklQaS Seg4U1gJCphlBfFe6HxdnFS16T8opelWnuupo5ttFzULifGycNumw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=DAM1HfnceDXwI1mL80Kpj8kwQYNN9MS58O7eMd1qEt0=; b=CHBsgyLV ELQR00ZT0j0hKacT3LpK+cz+drKw2QmLyckAssVrOhvKgCpM/MIB5BrYrtok2hFl ZgrRPCSOASqoZYaeX0YfdNbCMb29RqE642C1gwfmt7agr2mvzWrxDmKQ74oH/B+p oqB9DEWpqiXaAjBT6g2mkbApRlnkt4cVoXUqAoePrjhVFRAtCMUsT4Ipl6yA6v8r Mk9A6GHXiD+AoVVt4MlYEq3ZEfqj7j0hgNW5WtW+nro+wspW/eOnFk2Uqv6rw7i7 RxYFz/wHfKTYBsR6O6f9bBemA3l/5bdrojY7cPAqlFPYCOaaxE5ZYZvNIsk9LQTE IbTQueniNVVtBA== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id 9BB241025C for <32221@debbugs.gnu.org>; Fri, 20 Jul 2018 07:38:45 -0400 (EDT) From: Marius Bakke To: 32221@debbugs.gnu.org Subject: [PATCH 5/5] gnu: mariadb: Move static libraries to separate output. Date: Fri, 20 Jul 2018 13:38:37 +0200 Message-Id: <20180720113837.29412-5-mbakke@fastmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720113837.29412-1-mbakke@fastmail.com> References: <20180720113837.29412-1-mbakke@fastmail.com> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/databases.scm (mariadb)[outputs]: New field. [arguments]: Add 'move-static-libs' phase. --- gnu/packages/databases.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index de1db2f93..cbc530bec 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -646,6 +646,7 @@ Language.") (append (find-files "pcre") (find-files "zlib"))) #t)))) (build-system cmake-build-system) + (outputs '("out" "static")) (arguments '(#:configure-flags '("-DBUILD_CONFIG=mysql_release" @@ -742,6 +743,18 @@ Language.") (with-directory-excursion "mysql-test" (invoke "./mtr" "--parallel" (number->string (parallel-job-count)) "--verbose" "--skip-test-list=unstable-tests")))) + (add-after 'install 'move-static-libs + ;; Move ~37 MiB worth of static libraries to a separate output. + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib")) + (slib (string-append (assoc-ref outputs "static") "/lib"))) + (mkdir-p slib) + (with-directory-excursion lib + (for-each (lambda (ar) + (link ar (string-append slib "/" (basename ar))) + (delete-file ar)) + (find-files "." "\\.a$")) + #t)))) (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) -- 2.18.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jul 28 11:39:11 2018 Received: (at 32221-done) by debbugs.gnu.org; 28 Jul 2018 15:39:11 +0000 Received: from localhost ([127.0.0.1]:33023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjRJG-0000s0-Tw for submit@debbugs.gnu.org; Sat, 28 Jul 2018 11:39:11 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35533) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjRJF-0000rs-AU for 32221-done@debbugs.gnu.org; Sat, 28 Jul 2018 11:39:09 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id F1EFE215C6 for <32221-done@debbugs.gnu.org>; Sat, 28 Jul 2018 11:39:08 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 28 Jul 2018 11:39:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=MR7317gzVK5xl96ZDAjn0rz/paiBMb5X9mbKTVPEHRg=; b=ZVQGRw11 P2Qu5dAmvWIiHexOGds8xDHvBjytT1LUQzuCSm9YMeOUqK3CogV9WdgDzVfuzW2P s2Psk66LJPL/OuhjET9on8U+pZ3dTUy6OB00DbGytSPURHYCTHnMNxsBviOaIJpU rqLV2hy451B7xO87S+LLY7k4yU59bMimkFeOiunq3vFs7tg20aZH1l/XFaXPCqs7 47y6j2M1qaBPWZXlGtfBzf/4rQ331fsMLrLMBToGIkBedE96UkF7FSZVhA2ks9yw v3om43tKia/Ce+bWJ2axs7iJbKCABSgtS/Oszgw4Meqrn7gPj+EIpXa7vD7jv2rG TZ5xCjoaN850ig== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=MR7317gzVK5xl96ZDAjn0rz/paiBM b5X9mbKTVPEHRg=; b=D+31hr/Ws9tJwLXvi/eZpo4uZ2BSI280qmosrqQtpQrYt vmrQTScl5f75AxKvLCDT03DB90DzVT86Rd4r0/hx1Ryb3t5HehZvdK62oXXbze9c P9Z2apJs8z/MlC3jeM+qSvPGTP1FV8onR2ZcAzeWP/YVHib19aZ7Kkf8X3/dYeqD 7/cIAHtfMvEhAxc4OT2342eorZAf5zJISynhAlpvNUxDFSpX2WhYYzG1wUe4qnbc b5KGKBdgVYHkaup/zwwkJNYYcxacKgtxGQDr6mHelAtvlfqnlaR8JTRvFixU26Vb CuDDyspwQQb0h0SU3o/+Sli5Nrt/jW0ZEQWUSfFRQ== X-ME-Proxy: X-ME-Sender: Received: from localhost (95.92-221-151.customer.lyse.net [92.221.151.95]) by mail.messagingengine.com (Postfix) with ESMTPA id 68B10E450E for <32221-done@debbugs.gnu.org>; Sat, 28 Jul 2018 11:39:08 -0400 (EDT) From: Marius Bakke To: 32221-done@debbugs.gnu.org Subject: Re: [bug#32221] [PATCH 0/5] MariaDB updates In-Reply-To: <20180720113553.18138-1-mbakke@fastmail.com> References: <20180720113553.18138-1-mbakke@fastmail.com> User-Agent: Notmuch/0.27 (https://notmuchmail.org) Emacs/26.1 (x86_64-pc-linux-gnu) Date: Sat, 28 Jul 2018 17:39:06 +0200 Message-ID: <87lg9v4bfp.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 32221-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain Marius Bakke writes: > These patches gives us more control of the MariaDB package. In > particular, we now invoke the test runner directly, so we can pass > custom arguments; there's a phase for disabling plugins in an attempt > to fix the armhf build; we now use system zlib, pcre, xz and snappy; > and the package is ~37 MiB smaller thanks to a new "static" output. > > I've verified that 'qtbase' builds against this MariaDB. > > Marius Bakke (5): > gnu: mariadb: Disable plugin that fails on armhf. > gnu: mariadb: Run the full test suite. > gnu: mariadb: Update to 10.1.34. > gnu: mariadb: Remove some bundled libraries. > gnu: mariadb: Move static libraries to separate output. I've pushed this patchset with slight modifications: * Also unbundled YaSSL * Deleted static library instead separate output --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAltcjhoACgkQoqBt8qM6 VPobvQgAiSPy2slx2ffpJ3lMuGWq5nlP4D8gqXiSOw9MtbbWsJimJWcL9QJeD8XO 8GQCw51tUSirL+P1ComxUVgSWz1uTWjd18GPxK3z0oHiCfLNhqmALT/VxKqpYBdi 7ICP4Y2WSp2uWcRbmH/JA9bc1Hh84LmFazSjefD9P+aCckFQvX/o4X2SqYJOmr/p lyNs4pF4AJsqUXxpteR/kUqUZJIQC6vIbDboWuoe417PF7tCAfajTekWu/FsIHlm Evw6hplmApj79l5DVmVTDTeWQxPBViCJzCEKM6qweqFnD7C1ToL3zQVf00ecbE5P 77U48cIdyhpz8a9s88sEtH/W4IEtyg== =egMZ -----END PGP SIGNATURE----- --=-=-=-- From unknown Fri Jun 13 10:35:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 26 Aug 2018 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator