From patchwork Sat Apr 17 17:06:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28619 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 1D21427BC77; Sat, 17 Apr 2021 18:10:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 92C9727BC78 for ; Sat, 17 Apr 2021 18:10:22 +0100 (BST) Received: from localhost ([::1]:58398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSb-0002EK-Pk for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FL-QG for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0000G5-Bm for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQR-0005cF-7P for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924721232 (code B ref 47661); Sat, 17 Apr 2021 17:08:07 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:27 +0000 Received: from localhost ([127.0.0.1]:44309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPn-0005WE-Dl for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPl-0005W3-B3 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:25 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyz0x2Jz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyz0x2Jz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679243; bh=xcwEybTmbOosr1PNZFtTf7pZwD0xYMWJh8YQM+Uyejc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TmwGKfvrD/KuY93qFn6d4ikEt71INoW+Z9rXGbEb/g/qFdPgCB1Jnv4IOl958+c+5 f7bF2buneT7kTQB/AzEPYyZZIoxZHTnyZ4f9ed4JGgiqxqr2OvTPNNzz/7LnkDPvJR YQ39qWHPgO35Gr4qWZciB8zmhYCyiIfUk6UbBSDA= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:24 +0200 Message-Id: <20210417170648.3810-9-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-emacsql)[#:phases]: Use standard build and install phases. [build-emacsql-sqlite]: Use cc-for-target. --- gnu/packages/emacs-xyz.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32492a5535..360c7d0a2b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15565,7 +15565,6 @@ object has been freed.") (srfi srfi-26)) #:phases (modify-phases %standard-phases - (delete 'build) ;‘build-emacsql-sqlite’ compiles ‘*.el’ files. (add-before 'install 'patch-elisp-shell-shebangs (lambda _ (substitute* (find-files "." "\\.el") @@ -15576,7 +15575,7 @@ object has been freed.") (setenv "SHELL" "sh"))) (add-after 'setenv-shell 'build-emacsql-sqlite (lambda _ - (invoke "make" "binary" "CC=gcc"))) + (invoke "make" "binary" (string-append "CC=" ,(cc-for-target))))) (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite ;; This build phase installs emacs-emacsql binary. (lambda* (#:key outputs #:allow-other-keys) @@ -15597,16 +15596,7 @@ object has been freed.") ;; in the right place. ("(defvar emacsql-sqlite-executable" (string-append (assoc-ref outputs "out") - "/bin/emacsql-sqlite")))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (install-file "sqlite/emacsql-sqlite" - (string-append out "/bin")) - (for-each (cut install-file <> - (string-append out "/share/emacs/site-lisp")) - (find-files "." "\\.elc*$"))) - #t))))) + "/bin/emacsql-sqlite"))))))))) (inputs `(("emacs-minimal" ,emacs-minimal) ("mariadb" ,mariadb "lib")