From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 4DhoH5FWPWTeQwEASxT56A (envelope-from ) for ; Mon, 17 Apr 2023 16:24:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2GAqH5FWPWRCmwAAauVa8A (envelope-from ) for ; Mon, 17 Apr 2023 16:24:17 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 322B728144 for ; Mon, 17 Apr 2023 16:24:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz3-0004kh-Fk; Mon, 17 Apr 2023 09:33:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1poOz0-0004i3-6k for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:27 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poOyg-0003Co-1f for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1poOyf-0004eg-Tj for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 7/8] gnu: sbcl-clsql: Build with mariadb. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Apr 2023 13:33:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62903@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 62903-submit@debbugs.gnu.org id=B62903.168173837917824 (code B ref 62903); Mon, 17 Apr 2023 13:33:05 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:59 +0000 Received: from localhost ([127.0.0.1]:54037 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyY-0004dK-Oa for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:59 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:53538) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyW-0004cp-AV for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:56 -0400 Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-2f625d52275so1557644f8f.3 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738371; x=1684330371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=hUjjp76GdbEdmuq6fpYJQYEYo9H/gYZ4OGBMkMJqkEg=; b=JOMJe4xBJHva9bcXvYGOWgrOroM9xW0s2dtm6o3fIUGZfRpbXg+gBaviD5DVZPDQX2 2A759415CutPPYzcbX1sUMaWOKitSTWnoox5xlFCg40hXd6QM5dS5lzlzH5Tsk6FV1pW onC9u0LD4tpzJ0rNbivHV+djOTxRHbUBXZODqoM2XPVAGWUSGaIxWdvB82i4aI47QOKQ 5S6e8n3UJS1UyRXGS+CY7Nkqe1RSXKnNbsGFfGuVZUHxtgTZPPmHVwADGOI+kIDQiHqB P2sS13XVaGboMQnSjqfvzCHd3a8LCU8/RqNwTeS7cbdnX6qBVUdPVPk8AuYjkbHC2bEA CsgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738371; x=1684330371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hUjjp76GdbEdmuq6fpYJQYEYo9H/gYZ4OGBMkMJqkEg=; b=bnW6xGxA3Wbm7Bz7mADolOSEZb7qA4CAYZz0MImkCzgoX/wYbf//PKjCimjlW5dUXo DuPrkDi313IQSAA2nlqgHI6H2lYJeK/YEisE0UaX9NZ/qqSHyLIqijPfN4OdLKNQdLV9 zq/DylxP9vnLPVpuqYNLwdPB+FO5ArwCAHBaLdkQBhVU68NRMCwPoJYrKw7ZdEYNOIpH 5qTHy731IyOXeWhEU6n2afjXF3JqCci7A9rtrtFfT3FtyS0V34ijNZ1t0cSGRNrf7CRT a8pYf8jxMlLTkPWjE+vU9Unh5CuAq4x9guHScrpXaR14740WsW1w1ukJ13mWyG7X8pwQ wBjg== X-Gm-Message-State: AAQBX9eshuvRhTlLpBKB1w2UkvongUIbKK1c4p0LRi2rfYddmRyIBrZz quQrbLxfTTAhpvhBv2Pbk+QeBxLuvL0FFQ== X-Google-Smtp-Source: AKy350aNrJDRxbSnsakdB9yytAXGIR/HEiNJvSRqf3BJhGrXTQaX/KWFhFB24DWsKtzVcaPzMtoNyw== X-Received: by 2002:a5d:574a:0:b0:2f7:7c7b:bba6 with SMTP id q10-20020a5d574a000000b002f77c7bbba6mr6319585wrw.32.1681738370632; Mon, 17 Apr 2023 06:32:50 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id d17-20020a056000115100b002fa6929eb83sm2770761wrx.21.2023.04.17.06.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:50 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:28 +0300 Message-Id: <25d0aa82bea0a54ae40f3b1914d1865d2c4b7139.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=JOMJe4xB; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681741457; a=rsa-sha256; cv=none; b=pXmPyAPvhoXScOt7tKAO4m8S+7wD64s1gRvfCaAGfl1b1Zrry6j8pmqxhE/NzO+6T+UTMK lrYhk8/7jQGYGCZK/THbld9RB3AT6YA5aT+z0UkDKnZ3Kz/0aM8j2MqpJqJXmPLEexgRIU KwNcrKj2lRx+clbElodFX4l7vqwbC085O2Uk9fwbrM4tSHTLxS66wn3kFpmGZULTGc1tzK x4M966Hwetw3Ciixm7y30HrCp/tQZ7b2Hbgy25PvO4duC5syYLaCnW4mrwNq3ZO8jUHPNG T1MQLMsvSFjQfk7xL6MAZk6MEmNQRJ0Ky2lGNLyf9fXQ5MtwyLaZT3Okm7YRyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681741457; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hUjjp76GdbEdmuq6fpYJQYEYo9H/gYZ4OGBMkMJqkEg=; b=PxyLlhTSIaH4dw/2vEra1PwKZ5APjzACz5b/BRVTmnofSSWPF1BWs06aUFJUgnljhvXZOW wtwA3ftA35tOkeh9XKbOUkcSyRTiWI+TEMPnZauiS911Gdh50rLq+lSURRhuSSht67c8Nx 85x811poMdkh9fVMg4aSN7ZaRIkwlOoIJa0dePoJeWbc1cxmfGzx6kbV1BECjd+YKfkuDa JgWTO5EwJYO+ujluswsu5udlQaGc7bo+R5uS3C89mCWBHVn2qC8XuzPGRXaGSE0B2QUZpI O6Ncz0HAMK0XiC4YliabbW9rrKMYMJ6sOzrbGLtODL2J/LXbPg45t0VKVLq6+w== X-Migadu-Spam-Score: 1.48 X-Spam-Score: 1.48 X-Migadu-Queue-Id: 322B728144 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=JOMJe4xB; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-TUID: kLEKwtjPkw3g * gnu/packages/lisp-xyz.scm (sbcl-clsql)[inputs]: Remove mysql. Add mariadb:dev, mariadb:lib. [arguments]: Adjust custom 'build-helper-library phase to build with and link to mariadb. --- gnu/packages/lisp-xyz.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5f64809b28..d1ed5629e3 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016, 2017 Andy Patterson ;;; Copyright © 2017, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2017, 2018-2020, 2022 Efraim Flashner +;;; Copyright © 2017, 2018-2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2018 Alex Vong @@ -13138,7 +13138,8 @@ (define-public sbcl-clsql (inputs `(("cffi" ,sbcl-cffi) ("md5" ,sbcl-md5) - ("mysql" ,mysql) + ("mariadb-dev" ,mariadb "dev") + ("mariadb-lib" ,mariadb "lib") ("postgresql" ,postgresql) ("postmodern" ,sbcl-postmodern) ("sqlite" ,sqlite) @@ -13184,15 +13185,16 @@ (define-public sbcl-clsql lib)) (substitute* "db-mysql/mysql-loader.lisp" (("libmysqlclient" all) - (string-append (assoc-ref inputs "mysql") "/lib/" all)) + (string-append (assoc-ref inputs "mariadb-lib") "/lib/" all)) (("clsql-mysql-system::\\*library-file-dir\\*") lib))) #t)) (add-before 'build 'build-helper-library (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((mysql (assoc-ref inputs "mysql")) - (inc-dir (string-append mysql "/include/mysql")) - (lib-dir (string-append mysql "/lib")) + (let* ((mariadb-dev (assoc-ref inputs "mariadb-dev")) + (mariadb-lib (assoc-ref inputs "mariadb-lib")) + (inc-dir (string-append mariadb-dev "/include/mysql")) + (lib-dir (string-append mariadb-lib "/lib")) (shared-lib-dir (string-append (assoc-ref outputs "out") "/lib")) (shared-lib (string-append shared-lib-dir @@ -13202,7 +13204,7 @@ (define-public sbcl-clsql "-I" inc-dir "db-mysql/clsql_mysql.c" "-Wl,-soname=clsql_mysql" - "-L" lib-dir "-lmysqlclient" "-lz" + "-L" lib-dir "-lmariadb" "-lz" "-o" shared-lib) #t))) (add-after 'unpack 'fix-tests -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted