From patchwork Mon Apr 17 13:32:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 49222 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E848B1791B; Mon, 17 Apr 2023 14:33:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 471A61790B for ; Mon, 17 Apr 2023 14:33:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1poOz3-0004kB-1A; 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-0004i1-4v 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 1poOyf-0003Bf-2k 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 1poOye-0004eR-Uf for guix-patches@gnu.org; Mon, 17 Apr 2023 09:33:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62903] [PATCH 5/8] gnu: ulogd: 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:04 +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.168173837517798 (code B ref 62903); Mon, 17 Apr 2023 13:33:04 +0000 Received: (at 62903) by debbugs.gnu.org; 17 Apr 2023 13:32:55 +0000 Received: from localhost ([127.0.0.1]:54032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyU-0004cu-Ap for submit@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:55 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:41766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1poOyN-0004bw-Td for 62903@debbugs.gnu.org; Mon, 17 Apr 2023 09:32:48 -0400 Received: by mail-wm1-f50.google.com with SMTP id iw7-20020a05600c54c700b003f16fce55b5so2241009wmb.0 for <62903@debbugs.gnu.org>; Mon, 17 Apr 2023 06:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681738362; x=1684330362; 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=THxjpAZ/WnVX6+CjPRB+YGtJ/5ipCWWEhTQpckmpBwY=; b=G/FfDdktTPrqi8sba3YgsDNrezYeLjDCZmAMf/8z8Y5+Zat8CUoPpT6gCRBQZ7sjzz 7EvUxl0Y8GWxQhm90zlAPrcr3CBu/UNhRJ2hMbzIyXtsMMereyKMu/W7hMyDOrOgBOEQ vZvUStpe+vm++H7gjV71eQ89L25Zu68Jj0mZESpLHVucBkUdxOn4C0eyllsX+vyUv+QB i4kyvZXvJkcSv+20SbV61P4lh6ZOs3jc4BOzmPRGCTewM4NThFpOEw21P+kvombVYvQM agBsStO8otIMW88T1+LNatDcXPSUDIvR8BiXLBfjnTF0DccCYGIC4L1weZy8aUcFk06p sxQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681738362; x=1684330362; 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=THxjpAZ/WnVX6+CjPRB+YGtJ/5ipCWWEhTQpckmpBwY=; b=LoBlnIQhLklxxuESHeOcXIRWM66oZT9awjeQVtIVPYzBNTeaUz6rWP1oBtgLR9o5LB oB8OdNLMB9gUzrcTyserGTrzjKGMyi+qBnoBtuWSy1cJZdZ27TDvi2c/Cof3IkfPuhPb 8szDtiyb6zX/yvDqlcvQC8HqtjgVPaT1c+Jxy/swauf7NfPeMEAmpzwKtxBG3XlnhdfE cW3SigvNHU16p/FZ5dmyXPms0hRrGS6IDEf/loVwZXBO8KqAx7R1iAcD2YEXA6NFKlgL /SZqS0auOTKwpXBQ1MT1MWy7Bv/errM+mSidg7i8+HgYwMRsJsApPmx0tDzIrJzaEo5z 6uKw== X-Gm-Message-State: AAQBX9f5Dqd+FVDSzYnSmvN4Lu8qRVY8N+ddDWNsRFHCepAGByr5/30G +3sXOy5UZBCHVoiwmTqotB1Rcq34eqQhjw== X-Google-Smtp-Source: AKy350ZhPx2hu0EttVUEj88rElPGk+0dpSbxnDGJpkLvfM5+btAAfvkHds7B8p2zlxncGXgQ/tGBCw== X-Received: by 2002:a7b:cb44:0:b0:3f1:6458:99ba with SMTP id v4-20020a7bcb44000000b003f1645899bamr6789890wmj.29.1681738362352; Mon, 17 Apr 2023 06:32:42 -0700 (PDT) Received: from localhost ([2a02:ed3:911:ee00:b62e:99ff:fef0:7bc0]) by smtp.gmail.com with ESMTPSA id c1-20020a056000104100b002cea9d931e6sm10529838wrx.78.2023.04.17.06.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:32:41 -0700 (PDT) From: Efraim Flashner Date: Mon, 17 Apr 2023 16:32:26 +0300 Message-Id: <58223601b0869bad623fcb6c7c9a4b02f25fca6d.1681738065.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (ulogd)[inputs]: Remove mysql. Add mariadb:dev. [arguments]: Adjust configure-flags accordingly. --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 36b35448cc..3b123257f7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2022 Efraim Flashner +;;; Copyright © 2015-2018, 2020, 2022, 2023 Efraim Flashner ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016–2022 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Alex Kost @@ -8093,7 +8093,7 @@ (define-public ulogd libpcap jansson postgresql - mysql + (list mariadb "dev") zlib openssl)) (arguments @@ -8101,7 +8101,7 @@ (define-public ulogd #~(list (string-append "--with-pgsql=" (assoc-ref %build-inputs "postgresql")) (string-append "--with-mysql=" - (assoc-ref %build-inputs "mysql"))) + (assoc-ref %build-inputs "mariadb"))) #:phases #~(modify-phases %standard-phases (add-after 'install 'install-doc