From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KOhkF8JCb2CiZQEAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 19:52:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id UN5REcJCb2D8CwAAB5/wlQ (envelope-from ) for ; Thu, 08 Apr 2021 17:52:02 +0000 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 090671BB6F for ; Thu, 8 Apr 2021 19:52:02 +0200 (CEST) Received: from localhost ([::1]:35666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYoz-0005XK-5a for larch@yhetil.org; Thu, 08 Apr 2021 13:52:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYo7-000531-BK for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36665) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo5-0004Kw-J8 for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo5-0003jR-Ik for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 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: Thu, 08 Apr 2021 17:51:05 +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.161790425114182 (code B ref 47661); Thu, 08 Apr 2021 17:51:05 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:51 +0000 Received: from localhost ([127.0.0.1]:48184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnr-0003gg-Fo for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:51 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:36603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnq-0003gQ-8j for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:50 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMC5zlxz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMC5zlxz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904247; bh=Ro+IhA6HglDoDrQR30HDmY40iOfXh/oNIuMh2gJDZhQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KWTNgrm/bfk2DZRVDvcqNZMC4FbiMwOZwGmHVH0uU4KMDQaGqk/YTOUe6+r+3hOoV x8KeO3TmhZH+PMMHqgXGutiDdZTuk1LiMqqMStClGABzRYQLnIBa0j7jM/++NKHOdD Mnxxc8JnM8Fq3L9m2FLdNZN9lBHQI9Wql+KbPH5M= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:43 +0200 Message-Id: <20210408175007.13360-9-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617904322; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=Ro+IhA6HglDoDrQR30HDmY40iOfXh/oNIuMh2gJDZhQ=; b=uCIPasrZirvxaRH6FQPi9qaT2YT/MIdQTH1FGln1XKHNNrk2drcyOu5O8HY/oj0tEjNssQ 42HQedYiHGi0sz3zQgsl9wvevG+xN+ThQ68459PtmMOfflzvYJOCfdypNlj3DzstUXHBlt y+gVXblmEv91WMTqaGguR3gkuxwrYh7Wz46TOcy0zC2qH3FeZjeEFvK4GmxGcHeCriKM/b FEsRIqOu7FvXghfO3rtrXBqclTlIzckKWJi3gyN+7vnriDLkNXH1y7DZ6l8HItqtVdvJfx 0NXD6jnL0CAd7ZTWDpqWc5bM7NTcj2HkcGcSGDx7GyR9ZiCs50xrqiysVOSpYA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617904322; a=rsa-sha256; cv=none; b=jtJecuj2lQ9gSSIP0GdrAG/ncJ3PbPHkk+pvfyJ2Xc2FQqqXryKfs50WlhoPCOvma45La/ CQHsAK/iFXw4b6jrSYhg6pohGwJzkbkT36i39ufuAYn9siiPwvobhDY5EPWTzwaKt2My79 aUC31ketSutsiHXBpKgj75a9/cTq05lzGmY0AWMnvtmiqwKOchnHgbNNKqnfH67hi/xSJn 6Cxinv5wwWzjLjBwR3GMGpsUNsJMK15H92K/VLWsI8MoAYP+LXOn7vcya283qPtzgtUwUW o9GSF6z2f9tyNKy2ZKa7l6BNUehUPU+F5b6ljv2RVdmvrZ+Vvb2kaB/hcs6Sug== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="KWTNgrm/"; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b="KWTNgrm/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 090671BB6F X-Spam-Score: -0.34 X-Migadu-Scanner: scn0.migadu.com X-TUID: Hco/GgPQ69iw * 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 8861909bf1..79c3c42613 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15490,7 +15490,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") @@ -15501,7 +15500,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) @@ -15522,16 +15521,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") -- 2.31.1