From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id KEaGAaq37l5SBgAA0tVLHw (envelope-from ) for ; Sun, 21 Jun 2020 01:28:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id qF34OKm37l6GIwAAB5/wlQ (envelope-from ) for ; Sun, 21 Jun 2020 01:28:09 +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 8DA9B940222 for ; Sun, 21 Jun 2020 01:28:08 +0000 (UTC) Received: from localhost ([::1]:52984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmomE-0002Cm-BR for larch@yhetil.org; Sat, 20 Jun 2020 21:28:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmomA-0002Cd-1y for guix-patches@gnu.org; Sat, 20 Jun 2020 21:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47460) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmom9-0004tN-PT for guix-patches@gnu.org; Sat, 20 Jun 2020 21:28:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmom9-0004R3-MA for guix-patches@gnu.org; Sat, 20 Jun 2020 21:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40469] [PATCH core-updates v2 2/2] gnu: unicorn: Use python-build-system with grace. Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Jun 2020 01:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40469 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40469@debbugs.gnu.org Received: via spool by 40469-submit@debbugs.gnu.org id=B40469.159270288017040 (code B ref 40469); Sun, 21 Jun 2020 01:28:01 +0000 Received: (at 40469) by debbugs.gnu.org; 21 Jun 2020 01:28:00 +0000 Received: from localhost ([127.0.0.1]:59006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmom7-0004Qh-JU for submit@debbugs.gnu.org; Sat, 20 Jun 2020 21:27:59 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:55902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmom5-0004QS-3N for 40469@debbugs.gnu.org; Sat, 20 Jun 2020 21:27:57 -0400 Received: (qmail 32492 invoked by uid 1009); 21 Jun 2020 03:27:55 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25848. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.016716 secs); 21 Jun 2020 01:27:55 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 21 Jun 2020 03:27:55 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Sun, 21 Jun 2020 03:27:49 +0200 Message-Id: <20200621012749.3742-2-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200621012749.3742-1-kuba@kadziolka.net> References: <20200621012749.3742-1-kuba@kadziolka.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Qmailux-2.08st: added fake Content-Type header Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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-Spam-Score: 2.49 X-TUID: wdsJ6zSpN4e6 * gnu/packages/emulators.scm (unicorn)[arguments]: Remove the install-bindings-to-python-output phase. Adjust output names used in other phases. --- gnu/packages/emulators.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ab5b662915..0e83d7e82c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1700,17 +1700,6 @@ performance, features, and ease of use.") (guix build utils)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'install-bindings-to-python-output - (lambda* (#:key outputs #:allow-other-keys) - ;; python-build-system will build the bindings and install them to - ;; the "out" output, so change the build-internal names of the - ;; outputs. - ;; - ;; TODO: remove this once #40469 lands, through the core-updates - ;; holding zone, on master. - (set-car! (assoc "out" outputs) "lib") - (set-car! (assoc "python" outputs) "out") - #t)) (add-before 'build 'build-library (lambda* (#:key inputs #:allow-other-keys) (invoke "make" @@ -1723,7 +1712,7 @@ performance, features, and ease of use.") "UNICORN_STATIC=no" (string-append "PREFIX=" - (assoc-ref outputs "lib"))))) + (assoc-ref outputs "out"))))) (add-before 'build 'prepare-bindings (lambda* (#:key outputs #:allow-other-keys) (chdir "bindings/python") @@ -1736,7 +1725,7 @@ performance, features, and ease of use.") (("_path_list = \\[.*") (string-append "_path_list = [\"" - (assoc-ref outputs "lib") + (assoc-ref outputs "out") ;; eat the rest of the list "/lib\"] + 0*["))) #t)) @@ -1757,10 +1746,10 @@ performance, features, and ease of use.") (let* ((python-samples (find-files "." "sample_.*")) (c-samples (find-files "../../samples" ".*\\.c")) (python-docdir - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "python") "/share/doc/unicorn/samples")) (c-docdir - (string-append (assoc-ref outputs "lib") + (string-append (assoc-ref outputs "out") "/share/doc/unicorn/samples"))) (for-each (cut install-file <> c-docdir) c-samples) (for-each (cut install-file <> python-docdir) python-samples) -- 2.26.2