From patchwork Sun Jun 18 07:20:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 51030 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 8CA4127BBEA; Sun, 18 Jun 2023 08:41:16 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 BF39427BBE2 for ; Sun, 18 Jun 2023 08:41:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAn20-0002aI-4m; Sun, 18 Jun 2023 03:41:04 -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 1qAn1y-0002a4-LH for guix-patches@gnu.org; Sun, 18 Jun 2023 03:41:02 -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 1qAn1y-0000gN-D0 for guix-patches@gnu.org; Sun, 18 Jun 2023 03:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAn1y-0003L1-9a for guix-patches@gnu.org; Sun, 18 Jun 2023 03:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64146] [PATCH] gnu: recutils: Symlink bash loadables. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 07:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64146@debbugs.gnu.org Cc: Tobias Geerinckx-Rice , Maxime Devos X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168707401712761 (code B ref -1); Sun, 18 Jun 2023 07:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Jun 2023 07:40:17 +0000 Received: from localhost ([127.0.0.1]:53080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAn1F-0003Jl-HB for submit@debbugs.gnu.org; Sun, 18 Jun 2023 03:40:17 -0400 Received: from lists.gnu.org ([209.51.188.17]:51650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAn1D-0003Jd-B7 for submit@debbugs.gnu.org; Sun, 18 Jun 2023 03:40:15 -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 1qAn1C-00029h-W1 for guix-patches@gnu.org; Sun, 18 Jun 2023 03:40:15 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAn18-0008Kz-8p for guix-patches@gnu.org; Sun, 18 Jun 2023 03:40:14 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-977d7bdde43so459407766b.0 for ; Sun, 18 Jun 2023 00:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687074000; x=1689666000; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=x0O9yIfDJJ6L3JIAerMm6d1DtNfiw3pGrHqmbS/YSCs=; b=EjNEehGn1hbiofayPv7I5KKTgtT4hsa8uNLv9atM+DNxy+emTbYmNBuTAy6CKsh2q4 yDghTYGZQnG0Dwu7IONY3oITKjhxWMgqXpTuDqSbqIocAAGNP8TlF6YsAcgq+MZoErVr qtUR6YG0TbYf81sqZU8JPgWSid2/cxJ9S4CSzyY7NIm4dUZOkVCSbrbqxHCnCyMvZEkX C8isCm5PtEZn+gZ4n67UIAXpjYFLelSdTxE/1VKFF1bBVGnh/VkZqubg1BDmE+aFEzpA OWWqougS91pBXEiZLyqgMlqP/VYhkPf9TYKY+krNPoJMiFf0ZtpCt8aenIiYk/or5uZQ 05qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687074000; x=1689666000; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x0O9yIfDJJ6L3JIAerMm6d1DtNfiw3pGrHqmbS/YSCs=; b=E6FgdnzBsBuur9X4wvT+QCwnF2CLqg6lCCnGRbDDLj6leKKmd8NO9QYAG2TrFi1aNl B5yYA5Tn3QEuSB5KGFgA0O6ahat/nDPr4pMILWECUHsblqDdENMB878R7FYB7ZHLLmMI n5DnxpufptV+1ha146g7j92QOUup8Xwd0l8O6GsvBBcecHn9Xdc5oRAsOE7WjgegKNcs /2Sj1E/8Y4b/JsnSw3x8joc74r7kdve4q0wAlHwr3XpO7+DczvAUVwE/vNIIvT6xw3ZA qTtpv4wvtZTYSsYygCGEpOpVWs6RYqqdiYL6VPbbhK1VnEJivFa0zif12lr8QBvJlXZv sRag== X-Gm-Message-State: AC+VfDx6naAF1rqL6ZPLnfDruwblFIHY6+XaiUxXT+J310xq+xhixym4 ZWDdSiwdjEu174L6FFZCCMq+eijmh//RT/Zs X-Google-Smtp-Source: ACHHUZ4otG/DpOMm74z8IGH9eqjuN/+h3p4qCEgZSnTAVaGxBoEY9TonGBEVpUHRWbvqML2zI96z4Q== X-Received: by 2002:a17:907:1ca8:b0:973:84b0:b077 with SMTP id nb40-20020a1709071ca800b0097384b0b077mr5521016ejc.33.1687073999662; Sun, 18 Jun 2023 00:39:59 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w23-20020a1709064a1700b00978723f594bsm12866240eju.101.2023.06.18.00.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 00:39:59 -0700 (PDT) Message-Id: <90e1000ec033a080129d6155540837fc084bcc26.1687073862.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 18 Jun 2023 09:20:22 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=liliana.prikler@gmail.com; helo=mail-ej1-x641.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 This makes it so that the "enable" builtin finds readrec and testrec without having to supply the full store path. * gnu/packages/databases.scm (recutils)[#:phases]: Add ‘symlink-bash-loadables’. --- gnu/packages/databases.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) base-commit: e4087930f3ad60918689be5f4bca4ce3e22429f5 diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9928ede40e..36d4b65039 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1559,7 +1559,22 @@ (define-public recutils #~(list "--disable-static" (string-append "--with-bash-headers=" (search-input-directory %build-inputs - "include/bash"))))) + "include/bash"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'symlink-bash-loadables + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion (string-append + (assoc-ref outputs "out") + "/lib") + (mkdir "bash") + (for-each + (compose symlink + (lambda (loadable) + (values + (string-append (getcwd) "/" loadable ".so") + (string-append "bash/" loadable)))) + '("readrec" "testrec")))))))) (native-inputs (list bc check-0.14 pkg-config)) (inputs