From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 02:48:47 2020 Received: (at submit) by debbugs.gnu.org; 8 May 2020 06:48:47 +0000 Received: from localhost ([127.0.0.1]:44478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwoR-000642-J7 for submit@debbugs.gnu.org; Fri, 08 May 2020 02:48:47 -0400 Received: from lists.gnu.org ([209.51.188.17]:42868) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwoQ-00063u-1D for submit@debbugs.gnu.org; Fri, 08 May 2020 02:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWwoO-00066L-LG for guix-patches@gnu.org; Fri, 08 May 2020 02:48:45 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:36901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWwoM-0000Rr-Rj for guix-patches@gnu.org; Fri, 08 May 2020 02:48:44 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 234941C0006 for ; Fri, 8 May 2020 06:48:38 +0000 (UTC) From: Pierre Neidhardt To: guix-patches@gnu.org Subject: [PATCH 1/3] build: asdf-build-system: Use SBCL source in CL packages. Date: Fri, 8 May 2020 08:48:27 +0200 Message-Id: <20200508064827.1270-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=217.70.183.197; envelope-from=mail@ambrevar.xyz; helo=relay5-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/08 02:48:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) * guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to reset timestamps on files without write access. (install): When parent SBCL package is in the inputs, use its source. This way we get possibly patched sources in CL packages as well (e.g. for FFI). This is also useful for sources that generate files on load-op, like cl-unicode. * guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL parent as a native input so that it can be used in the install phase above. --- guix/build-system/asdf.scm | 5 ++++- guix/build/asdf-build-system.scm | 34 ++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index f3f4b49bcf..5a512d5332 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -85,7 +85,8 @@ valid." ;; files before compiling. (for-each (lambda (file) (let ((s (lstat file))) - (unless (eq? (stat:type s) 'symlink) + (unless (or (eq? (stat:type s) 'symlink) + (not (access? file W_OK))) (utime file 0 0 0 0)))) (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) @@ -97,12 +98,33 @@ valid." (find-files target "\\.asd$")) #t)) -(define* (install #:key outputs #:allow-other-keys) - "Copy and symlink all the source files." +(define* (install #:key inputs outputs #:allow-other-keys) + "Copy and symlink all the source files. +The source files are taken from the corresponding SBCL package if it's present +in the native-inputs." (define output (assoc-ref outputs "out")) - (copy-files-to-output output - (package-name->name+version - (strip-store-file-name output)))) + (define package-name + (package-name->name+version + (strip-store-file-name output))) + (define no-prefix-name (string-drop package-name (string-length "cl-"))) + (define sbcl-source (or (assoc-ref inputs (string-append "sbcl-" no-prefix-name)) + (assoc-ref inputs (string-append "sbcl-" package-name)))) + + (define source-directory + (if sbcl-source + (find file-exists? + (list (string-append sbcl-source + "/share/common-lisp/sbcl-source/" + no-prefix-name) + (string-append sbcl-source + "/share/common-lisp/sbcl-source/" + package-name) + ".")) + ".")) + (with-directory-excursion source-directory + (copy-files-to-output output + (package-name->name+version + (strip-store-file-name output))))) (define* (copy-source #:key outputs asd-system-name #:allow-other-keys) "Copy the source to the library output." -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 02:59:12 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 06:59:12 +0000 Received: from localhost ([127.0.0.1]:44491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwyK-0006Jb-Qc for submit@debbugs.gnu.org; Fri, 08 May 2020 02:59:12 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:50475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwyI-0006JH-SY for 41135@debbugs.gnu.org; Fri, 08 May 2020 02:58:59 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id AD76540003; Fri, 8 May 2020 06:58:52 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [PATCH 2/3] gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. Date: Fri, 8 May 2020 08:58:28 +0200 Message-Id: <20200508065829.5711-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 Cc: glv@posteo.net, cox.katherine.e@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f406ded66..6a199c32f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5861,8 +5861,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 02:59:12 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 06:59:12 +0000 Received: from localhost ([127.0.0.1]:44493 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwyW-0006K7-6n for submit@debbugs.gnu.org; Fri, 08 May 2020 02:59:12 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:49307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWwyJ-0006JJ-Pk for 41135@debbugs.gnu.org; Fri, 08 May 2020 02:59:00 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 8624C40009; Fri, 8 May 2020 06:58:53 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [PATCH 3/3] gnu: cl-iolib: Propagate libfixposix or else it won't compile. Date: Fri, 8 May 2020 08:58:29 +0200 Message-Id: <20200508065829.5711-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508065829.5711-1-mail@ambrevar.xyz> References: <20200508065829.5711-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 Cc: glv@posteo.net, cox.katherine.e@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a199c32f9..f8685f8ce1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5562,7 +5562,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 06:37:38 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 10:37:38 +0000 Received: from localhost ([127.0.0.1]:44654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0Nu-0003Tm-2S for submit@debbugs.gnu.org; Fri, 08 May 2020 06:37:38 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:32775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0Ns-0003TO-77 for 41135@debbugs.gnu.org; Fri, 08 May 2020 06:37:37 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id EB6B3E0006 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 10:37:29 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v2 2/4] gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. Date: Fri, 8 May 2020 12:37:12 +0200 Message-Id: <20200508103714.17970-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508103714.17970-1-mail@ambrevar.xyz> References: <20200508103714.17970-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f406ded66..6a199c32f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5861,8 +5861,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 06:37:38 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 10:37:38 +0000 Received: from localhost ([127.0.0.1]:44656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0Nu-0003To-9s for submit@debbugs.gnu.org; Fri, 08 May 2020 06:37:38 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:51411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0Ns-0003TQ-A8 for 41135@debbugs.gnu.org; Fri, 08 May 2020 06:37:37 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 6924DE0007 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 10:37:30 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v2 3/4] gnu: cl-iolib: Propagate libfixposix or else it won't compile. Date: Fri, 8 May 2020 12:37:13 +0200 Message-Id: <20200508103714.17970-3-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508103714.17970-1-mail@ambrevar.xyz> References: <20200508103714.17970-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a199c32f9..f8685f8ce1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5562,7 +5562,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 06:37:54 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 10:37:54 +0000 Received: from localhost ([127.0.0.1]:44658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0O9-0003UR-LY for submit@debbugs.gnu.org; Fri, 08 May 2020 06:37:54 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:44293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX0Ns-0003TN-8q for 41135@debbugs.gnu.org; Fri, 08 May 2020 06:37:52 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 61971E0004 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 10:37:28 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v2 1/4] build: asdf-build-system: Use SBCL source in CL packages. Date: Fri, 8 May 2020 12:37:11 +0200 Message-Id: <20200508103714.17970-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to reset timestamps on files without write access. (install): When parent SBCL package is in the inputs, use its source. This way we get possibly patched sources in CL packages as well (e.g. for FFI). This is also useful for sources that generate files on load-op, like cl-unicode. * guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL parent as a native input so that it can be used in the install phase above. --- guix/build-system/asdf.scm | 5 +++- guix/build/asdf-build-system.scm | 40 +++++++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index f3f4b49bcf..158d351d1a 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -85,7 +85,8 @@ valid." ;; files before compiling. (for-each (lambda (file) (let ((s (lstat file))) - (unless (eq? (stat:type s) 'symlink) + (unless (or (eq? (stat:type s) 'symlink) + (not (access? file W_OK))) (utime file 0 0 0 0)))) (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) @@ -97,12 +98,39 @@ valid." (find-files target "\\.asd$")) #t)) -(define* (install #:key outputs #:allow-other-keys) - "Copy and symlink all the source files." +(define* (install #:key inputs outputs #:allow-other-keys) + "Copy and symlink all the source files. +The source files are taken from the corresponding SBCL package if it's present +in the native-inputs." + ;; TODO: Use lisp-type instead of hardcoding SBCL. (define output (assoc-ref outputs "out")) - (copy-files-to-output output - (package-name->name+version - (strip-store-file-name output)))) + (define package-name + (package-name->name+version + (strip-store-file-name output))) + (define no-prefix-name (string-drop package-name (string-length "cl-"))) + (define sbcl-source (or (assoc-ref inputs (string-append "sbcl-" no-prefix-name)) + (assoc-ref inputs (string-append "sbcl-" package-name)))) + + (define (first-subdirectory directory) ; From gnu-build-system. + "Return the file name of the first sub-directory of DIRECTORY." + (match (scandir directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append directory "/" + file))))) + ((first . _) first))) + + (define source-directory + (if (and sbcl-source + (file-exists? + (string-append sbcl-source "/share/common-lisp/sbcl-source/"))) + (let ((source (string-append sbcl-source "/share/common-lisp/sbcl-source/"))) + (string-append source (first-subdirectory source))) + ".")) + (with-directory-excursion source-directory + (copy-files-to-output output + (package-name->name+version + (strip-store-file-name output))))) (define* (copy-source #:key outputs asd-system-name #:allow-other-keys) "Copy the source to the library output." -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 12:36:34 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 16:36:34 +0000 Received: from localhost ([127.0.0.1]:46202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX5zF-0006UK-I5 for submit@debbugs.gnu.org; Fri, 08 May 2020 12:36:34 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:38611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX5zC-0006U1-F7 for 41135@debbugs.gnu.org; Fri, 08 May 2020 12:36:32 -0400 X-Originating-IP: 78.199.129.170 Received: from mimimi (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 38F9D6000A for <41135@debbugs.gnu.org>; Fri, 8 May 2020 16:36:21 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: Re: bug#41135: Acknowledgement ([PATCH 1/3] build: asdf-build-system: Use SBCL source in CL packages.) In-Reply-To: References: <20200508064827.1270-1-mail@ambrevar.xyz> Date: Fri, 08 May 2020 18:36:20 +0200 Message-ID: <87k11ms7sr.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attaching [Patch v2 4/4] since "git send-email" won't let me send it. -- Pierre Neidhardt https://ambrevar.xyz/ From da8b35adcd392b6c4bb0394f624ac86b9c61e4b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 8 May 2020 11:14:02 +0200 Subject: [Patch v2 4/4] gnu: cl-cffi-gtk-gobject: [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.195 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.195 listed in wl.mailspike.net] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: ambrevar.xyz] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Attaching [Patch v2 4/4] since "git send-email" won't let me send it. -- Pierre Neidhardt https://ambrevar.xyz/ From da8b35adcd392b6c4bb0394f624ac86b9c61e4b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 8 May 2020 11:14:02 +0200 Subject: [Patch v2 4/4] gnu: cl-cffi-gtk-gobject: [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: ambrevar.xyz] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.195 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.195 listed in wl.mailspike.net] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: ambrevar.xyz] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: ambrevar.xyz (xyz)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Attaching [Patch v2 4/4] since "git send-email" won't let me send it. =2D-=20 Pierre Neidhardt https://ambrevar.xyz/ --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl61ioQACgkQm9z0l6S7 zH+aEQgAjk6Vgjh4AtAcjDQlrCCLJj4IqGOct696mdcNVpyeeRRMKjMRUlUqHO/i ti+LklRSBxWrSZSQnm9A9xjEZBrHidAAM6o/hGV0IgGSCpdlI4LLmHX8t7eAs32T Pym0B9B4bSlsvtnz37hH6jBXfdZusGcckDjdxSbXEWaRF7M/GfBCC9YNhxJdYo/K cPbeag4t9ElAB3l7Ou11vjD7qop+1SA5KgVSU4XemJn+BfQYo7CQxwWcHiWjff8Y DqrXGOKrQ9JP/78JzEOJhPQNgA03lrZrNHdEaQDpphpLnKYyIvKzfQZIWTSqqKrK uDGQY7hvLQNxBa+ww60eL+12JcWZKQ== =08Wh -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0004-gnu-cl-cffi-gtk-gobject-Fix-build-with-new-sbcl-pack.patch >From da8b35adcd392b6c4bb0394f624ac86b9c61e4b7 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 8 May 2020 11:14:02 +0200 Subject: [Patch v2 4/4] gnu: cl-cffi-gtk-gobject: Fix build with new sbcl-package->cl-source-package function. * gnu/packages/lisp-xyz.scm (sbcl-cl-cffi-gtk-boot0)[inputs]: Add all inputs. [arguments]: Patch whole source. (sbcl-cl-cffi-gtk-glib)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-glib)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gobject)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gobject)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gio)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gio)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-cairo)[inputs]: Remove cairo. (sbcl-cl-cffi-gtk-cairo)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-pango)[inputs]: Remove pango. (sbcl-cl-cffi-gtk-pango)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-pixbuf)[inputs]: Remove gdk-pixbuf. (sbcl-cl-cffi-gtk-gdk-pixbuf)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-gdk)[inputs]: Remove gtk+. (sbcl-cl-cffi-gtk-gdk-gdk)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk)[arguments]: Reuse boot0 source. --- gnu/packages/lisp-xyz.scm | 341 ++++++++++++++++++-------------------- 1 file changed, 165 insertions(+), 176 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f8685f8ce1..a5e5548fbf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2876,7 +2876,41 @@ Lisp implementations.") (inputs `(("iterate" ,sbcl-iterate) ("cffi" ,sbcl-cffi) - ("trivial-features" ,sbcl-trivial-features))) + ("trivial-features" ,sbcl-trivial-features) + ("glib" ,glib) + ("cairo" ,cairo) + ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk" ,gtk+))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "glib/glib.init.lisp" + (("libglib|libgthread" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gobject/gobject.init.lisp" + (("libgobject" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gio/gio.init.lisp" + (("libgio" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "cairo/cairo.init.lisp" + (("libcairo" all) + (string-append (assoc-ref inputs "cairo") "/lib/" all))) + (substitute* "pango/pango.init.lisp" + (("libpango" all) + (string-append (assoc-ref inputs "pango") "/lib/" all))) + (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" + (("libgdk_pixbuf" all) + (string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" all))) + (substitute* "gdk/gdk.init.lisp" + (("libgdk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all))) + (substitute* "gdk/gdk.package.lisp" + (("libgtk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all)))))))) (home-page "https://github.com/Ferada/cl-cffi-gtk/") (synopsis "Common Lisp binding for GTK+3") (description @@ -2889,192 +2923,155 @@ is a library for creating graphical user interfaces.") (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-glib") (inputs - `(("glib" ,glib) - ("bordeaux-threads" ,sbcl-bordeaux-threads) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "glib/cl-cffi-gtk-glib.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "glib/glib.init.lisp" - (("libglib|libgthread" all) - (string-append (assoc-ref inputs "glib") "/lib/" all)))))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "glib/cl-cffi-gtk-glib.asd"))))) (define-public sbcl-cl-cffi-gtk-gobject (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gobject") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("closer-mop" ,sbcl-closer-mop) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gobject/gobject.init.lisp" - (("libgobject" all) (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gobject"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gobject/cl-cffi-gtk-gobject.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gobject"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gio (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gio") (inputs - `(("glib" ,glib) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gio/cl-cffi-gtk-gio.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gio/gio.init.lisp" - (("libgio" all) - (string-append - (assoc-ref inputs "glib") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gio"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gio/cl-cffi-gtk-gio.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gio"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-cairo (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-cairo") (inputs - `(("cairo" ,cairo) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cairo/cairo.init.lisp" - (("libcairo" all) - (string-append - (assoc-ref inputs "cairo") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-cairo"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "cairo/cl-cffi-gtk-cairo.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-cairo"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-pango (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-pango") (inputs - `(("pango" ,pango) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "pango/cl-cffi-gtk-pango.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "pango/pango.init.lisp" - (("libpango" all) - (string-append - (assoc-ref inputs "pango") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-pango"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "pango/cl-cffi-gtk-pango.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-pango"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk-pixbuf (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk-pixbuf") (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + `(("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" - (("libgdk_pixbuf" all) - (string-append - (assoc-ref inputs "gdk-pixbuf") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk-pixbuf"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk-pixbuf"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk-gdk (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk") (inputs - `(("gtk" ,gtk+) - ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) @@ -3082,32 +3079,23 @@ is a library for creating graphical user interfaces.") ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments - `(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "gdk/gdk.init.lisp" - (("libgdk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))) - (substitute* "gdk/gdk.package.lisp" - (("libgtk" all) - (string-append - (assoc-ref inputs "gtk") "/lib/" all))))) - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-gdk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gdk/cl-cffi-gtk-gdk.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-gdk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public sbcl-cl-cffi-gtk (package @@ -3122,26 +3110,27 @@ is a library for creating graphical user interfaces.") (native-inputs `(("fiveam" ,sbcl-fiveam))) (arguments - `(#:asd-file "gtk/cl-cffi-gtk.asd" - #:test-asd-file "test/cl-cffi-gtk-test.asd" + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boot0) + ((#:asd-file _ "") "gtk/cl-cffi-gtk.asd") + ((#:test-asd-file _ "") "test/cl-cffi-gtk-test.asd") ;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'link-source - ;; Since source is particularly heavy (16MiB+), let's reuse it - ;; across the different components of cl-ffi-gtk. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk-glib")) - (out-source (string-append (assoc-ref outputs "out") - "/share/common-lisp/sbcl-source/" - "cl-cffi-gtk"))) - (delete-file-recursively out-source) - (symlink glib-source out-source) - #t)))))))) + ((#:tests? _ #f) #f) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cffi-gtk-glib") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-source/" + "cl-cffi-gtk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) -- 2.25.1 --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:39:57 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:39:57 +0000 Received: from localhost ([127.0.0.1]:46245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yb-00086Y-Dm for submit@debbugs.gnu.org; Fri, 08 May 2020 13:39:57 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:50927) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yZ-000864-79 for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:39:56 -0400 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay11.mail.gandi.net (Postfix) with ESMTPSA id EFC14100004 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:39:48 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [PATCH 2/4] gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. Date: Fri, 8 May 2020 19:39:38 +0200 Message-Id: <20200508173940.20147-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508173940.20147-1-mail@ambrevar.xyz> References: <20200508173940.20147-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f406ded66..6a199c32f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5861,8 +5861,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:39:57 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:39:58 +0000 Received: from localhost ([127.0.0.1]:46247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yb-00086f-Lw for submit@debbugs.gnu.org; Fri, 08 May 2020 13:39:57 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:57329) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yZ-000866-60 for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:39:56 -0400 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 70B8B100006 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:39:49 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [PATCH 3/4] gnu: cl-iolib: Propagate libfixposix or else it won't compile. Date: Fri, 8 May 2020 19:39:39 +0200 Message-Id: <20200508173940.20147-3-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508173940.20147-1-mail@ambrevar.xyz> References: <20200508173940.20147-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a199c32f9..f8685f8ce1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5562,7 +5562,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:39:58 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:39:58 +0000 Received: from localhost ([127.0.0.1]:46249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yb-00086m-TY for submit@debbugs.gnu.org; Fri, 08 May 2020 13:39:58 -0400 Received: from relay11.mail.gandi.net ([217.70.178.231]:40743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX6yZ-000863-5u for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:39:56 -0400 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 4F42E100002 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:39:47 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [PATCH 1/4] build: asdf-build-system: Use SBCL source in CL packages. Date: Fri, 8 May 2020 19:39:37 +0200 Message-Id: <20200508173940.20147-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to reset timestamps on files without write access. (install): When parent SBCL package is in the inputs, use its source. This way we get possibly patched sources in CL packages as well (e.g. for FFI). This is also useful for sources that generate files on load-op, like cl-unicode. * guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL parent as a native input so that it can be used in the install phase above. --- guix/build-system/asdf.scm | 5 ++- guix/build/asdf-build-system.scm | 54 ++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index f3f4b49bcf..25dd031962 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -85,7 +85,8 @@ valid." ;; files before compiling. (for-each (lambda (file) (let ((s (lstat file))) - (unless (eq? (stat:type s) 'symlink) + (unless (or (eq? (stat:type s) 'symlink) + (not (access? file W_OK))) (utime file 0 0 0 0)))) (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) @@ -97,12 +98,53 @@ valid." (find-files target "\\.asd$")) #t)) -(define* (install #:key outputs #:allow-other-keys) - "Copy and symlink all the source files." +(define* (install #:key inputs outputs #:allow-other-keys) + "Copy and symlink all the source files. +The source files are taken from the corresponding compile package (e.g. SBCL) +if it's present in the native-inputs." (define output (assoc-ref outputs "out")) - (copy-files-to-output output - (package-name->name+version - (strip-store-file-name output)))) + (define package-name + (package-name->name+version + (strip-store-file-name output))) + (define (no-prefix pkgname) + (if (string-index pkgname #\-) + (string-drop pkgname (1+ (string-index pkgname #\-))) + pkgname)) + (define parent + (match (assoc package-name inputs + (lambda (key alist-car) + (let* ((alt-key (no-prefix key)) + (alist-car (no-prefix alist-car))) + (or (string=? alist-car key) + (string=? alist-car alt-key))))) + (#f #f) + (p (cdr p)))) + (define parent-name + (and parent + (package-name->name+version (strip-store-file-name parent)))) + (define parent-source + (and parent + (string-append parent "/share/common-lisp/" + (string-take parent-name + (string-index parent-name #\-)) + "-source"))) + + (define (first-subdirectory directory) ; From gnu-build-system. + "Return the file name of the first sub-directory of DIRECTORY." + (match (scandir directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append directory "/" + file))))) + ((first . _) first))) + (define source-directory + (if (and parent-source + (file-exists? parent-source)) + (string-append parent-source "/" (first-subdirectory parent-source)) + ".")) + + (with-directory-excursion source-directory + (copy-files-to-output output package-name))) (define* (copy-source #:key outputs asd-system-name #:allow-other-keys) "Copy the source to the library output." -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:43:21 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:43:21 +0000 Received: from localhost ([127.0.0.1]:46258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71s-0008Cn-Hl for submit@debbugs.gnu.org; Fri, 08 May 2020 13:43:20 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:40079) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71q-0008CL-KZ for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:43:19 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id C598360006 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:43:11 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v3 1/4] build: asdf-build-system: Use SBCL source in CL packages. Date: Fri, 8 May 2020 19:42:59 +0200 Message-Id: <20200508174302.21921-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * guix/build/asdf-build-system.scm (copy-files-to-output): Don't attempt to reset timestamps on files without write access. (install): When parent SBCL package is in the inputs, use its source. This way we get possibly patched sources in CL packages as well (e.g. for FFI). This is also useful for sources that generate files on load-op, like cl-unicode. * guix/build-system/asdf.scm (package-with-build-system): Forward the SBCL parent as a native input so that it can be used in the install phase above. --- guix/build-system/asdf.scm | 5 ++- guix/build/asdf-build-system.scm | 54 ++++++++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 7 deletions(-) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index f794bf006b..630b99e2bf 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -230,7 +230,10 @@ set up using CL source package conventions." ((#:phases phases) (list phases-transformer phases)))) (inputs (new-inputs package-inputs)) (propagated-inputs (new-propagated-inputs)) - (native-inputs (new-inputs package-native-inputs)) + (native-inputs (append (if target-is-source? + (list (list (package-name pkg) pkg)) + '()) + (new-inputs package-native-inputs))) (outputs (if target-is-source? '("out") (package-outputs pkg))))) diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index f3f4b49bcf..25dd031962 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -85,7 +85,8 @@ valid." ;; files before compiling. (for-each (lambda (file) (let ((s (lstat file))) - (unless (eq? (stat:type s) 'symlink) + (unless (or (eq? (stat:type s) 'symlink) + (not (access? file W_OK))) (utime file 0 0 0 0)))) (find-files source #:directories? #t)) (copy-recursively source target #:keep-mtime? #t) @@ -97,12 +98,53 @@ valid." (find-files target "\\.asd$")) #t)) -(define* (install #:key outputs #:allow-other-keys) - "Copy and symlink all the source files." +(define* (install #:key inputs outputs #:allow-other-keys) + "Copy and symlink all the source files. +The source files are taken from the corresponding compile package (e.g. SBCL) +if it's present in the native-inputs." (define output (assoc-ref outputs "out")) - (copy-files-to-output output - (package-name->name+version - (strip-store-file-name output)))) + (define package-name + (package-name->name+version + (strip-store-file-name output))) + (define (no-prefix pkgname) + (if (string-index pkgname #\-) + (string-drop pkgname (1+ (string-index pkgname #\-))) + pkgname)) + (define parent + (match (assoc package-name inputs + (lambda (key alist-car) + (let* ((alt-key (no-prefix key)) + (alist-car (no-prefix alist-car))) + (or (string=? alist-car key) + (string=? alist-car alt-key))))) + (#f #f) + (p (cdr p)))) + (define parent-name + (and parent + (package-name->name+version (strip-store-file-name parent)))) + (define parent-source + (and parent + (string-append parent "/share/common-lisp/" + (string-take parent-name + (string-index parent-name #\-)) + "-source"))) + + (define (first-subdirectory directory) ; From gnu-build-system. + "Return the file name of the first sub-directory of DIRECTORY." + (match (scandir directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append directory "/" + file))))) + ((first . _) first))) + (define source-directory + (if (and parent-source + (file-exists? parent-source)) + (string-append parent-source "/" (first-subdirectory parent-source)) + ".")) + + (with-directory-excursion source-directory + (copy-files-to-output output package-name))) (define* (copy-source #:key outputs asd-system-name #:allow-other-keys) "Copy the source to the library output." -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:43:24 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:43:24 +0000 Received: from localhost ([127.0.0.1]:46260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71w-0008D2-0c for submit@debbugs.gnu.org; Fri, 08 May 2020 13:43:24 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:50917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71q-0008CO-NN for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:43:19 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id DC73C60007 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:43:12 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v3 3/4] gnu: cl-iolib: Propagate libfixposix or else it won't compile. Date: Fri, 8 May 2020 19:43:01 +0200 Message-Id: <20200508174302.21921-3-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508174302.21921-1-mail@ambrevar.xyz> References: <20200508174302.21921-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-iolib)[propagated-inputs]: Add libfixposix. --- gnu/packages/lisp-xyz.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a199c32f9..f8685f8ce1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5562,7 +5562,13 @@ and @code{kqueue(2)}), a pathname library and file-system utilities.") ((#:asd-system-name _) "iolib"))))) (define-public cl-iolib - (sbcl-package->cl-source-package sbcl-iolib)) + (let ((parent (sbcl-package->cl-source-package sbcl-iolib))) + (package + (inherit parent) + (propagated-inputs + ;; Need header to compile. + `(("libfixposix" ,libfixposix) + ,@(package-propagated-inputs parent)))))) (define-public sbcl-ieee-floats (let ((commit "566b51a005e81ff618554b9b2f0b795d3b29398d") -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Fri May 08 13:43:24 2020 Received: (at 41135) by debbugs.gnu.org; 8 May 2020 17:43:24 +0000 Received: from localhost ([127.0.0.1]:46262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71w-0008D5-6w for submit@debbugs.gnu.org; Fri, 08 May 2020 13:43:24 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:60241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jX71q-0008CM-KZ for 41135@debbugs.gnu.org; Fri, 08 May 2020 13:43:19 -0400 X-Originating-IP: 78.199.129.170 Received: from localhost.localdomain (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 691C460002 for <41135@debbugs.gnu.org>; Fri, 8 May 2020 17:43:12 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [Patch v3 2/4] gnu: cl-dexador: Fix build with new sbcl-package->cl-source-package function. Date: Fri, 8 May 2020 19:43:00 +0200 Message-Id: <20200508174302.21921-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200508174302.21921-1-mail@ambrevar.xyz> References: <20200508174302.21921-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) * gnu/packages/lisp-xyz.scm (cl-dexador)[arguments]: Remove 'reset-gzip-timestamps phase. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4f406ded66..6a199c32f9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5861,8 +5861,8 @@ neat APIs and connection-pooling. It is meant to supersede Drakma.") ;; asdf-build-system/source has its own phases and does not inherit ;; from asdf-build-system/sbcl phases. (modify-phases %standard-phases/source - (add-after 'unpack 'fix-permissions - (lambda _ (make-file-writable "t/data/test.gz") #t))))))) + ;; Already done in SBCL package. + (delete 'reset-gzip-timestamps)))))) (define-public ecl-dexador (sbcl-package->ecl-package sbcl-dexador)) -- 2.25.1 From debbugs-submit-bounces@debbugs.gnu.org Sat May 09 04:50:43 2020 Received: (at 41135) by debbugs.gnu.org; 9 May 2020 08:50:43 +0000 Received: from localhost ([127.0.0.1]:46770 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXLBy-0002Bv-6I for submit@debbugs.gnu.org; Sat, 09 May 2020 04:50:43 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:57369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jXLBv-0002BZ-CC for 41135@debbugs.gnu.org; Sat, 09 May 2020 04:50:40 -0400 X-Originating-IP: 78.199.129.170 Received: from mimimi (moi44-1-78-199-129-170.fbx.proxad.net [78.199.129.170]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id D465A1C0003 for <41135@debbugs.gnu.org>; Sat, 9 May 2020 08:50:30 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: [bug#41135] [Patch v3 4/4] gnu: cl-cffi-gtk-gobject: Fix build with new References: <20200508064827.1270-1-mail@ambrevar.xyz> <20200508174302.21921-1-mail@ambrevar.xyz> Date: Sat, 09 May 2020 10:50:29 +0200 In-Reply-To: <20200508174302.21921-1-mail@ambrevar.xyz> (Pierre Neidhardt's message of "Fri, 8 May 2020 19:42:59 +0200") Message-ID: <87eertsd9m.fsf_-_@ambrevar.xyz> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/lisp-xyz.scm (sbcl-cl-cffi-gtk-boot0)[inputs]: Add all input= s. [arguments]: Patch whole source. (sbcl-cl-cffi-gtk-glib)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-glib)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gobject)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gobject)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gio)[inputs]: Remove glib. (sbcl-cl-cffi-gtk-gio)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-cairo)[inputs]: Remove cairo. (sbcl-cl-cffi-gtk-cairo)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-pango)[inputs]: Remove pango. (sbcl-cl-cffi-gtk-pango)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-pixbuf)[inputs]: Remove gdk-pixbuf. (sbcl-cl-cffi-gtk-gdk-pixbuf)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk-gdk-gdk)[inputs]: Remove gtk+. (sbcl-cl-cffi-gtk-gdk-gdk)[arguments]: Reuse boot0 source. (sbcl-cl-cffi-gtk)[arguments]: Reuse boot0 source. =2D-- gnu/packages/lisp-xyz.scm | 341 ++++++++++++++++++-------------------- 1 file changed, 165 insertions(+), 176 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f8685f8ce1..a5e5548fbf 100644 =2D-- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2876,7 +2876,41 @@ Lisp implementations.") (inputs `(("iterate" ,sbcl-iterate) ("cffi" ,sbcl-cffi) =2D ("trivial-features" ,sbcl-trivial-features))) + ("trivial-features" ,sbcl-trivial-features) + ("glib" ,glib) + ("cairo" ,cairo) + ("pango" ,pango) + ("gdk-pixbuf" ,gdk-pixbuf) + ("gtk" ,gtk+))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "glib/glib.init.lisp" + (("libglib|libgthread" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gobject/gobject.init.lisp" + (("libgobject" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "gio/gio.init.lisp" + (("libgio" all) + (string-append (assoc-ref inputs "glib") "/lib/" all))) + (substitute* "cairo/cairo.init.lisp" + (("libcairo" all) + (string-append (assoc-ref inputs "cairo") "/lib/" all))) + (substitute* "pango/pango.init.lisp" + (("libpango" all) + (string-append (assoc-ref inputs "pango") "/lib/" all))) + (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" + (("libgdk_pixbuf" all) + (string-append (assoc-ref inputs "gdk-pixbuf") "/lib/" a= ll))) + (substitute* "gdk/gdk.init.lisp" + (("libgdk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all))) + (substitute* "gdk/gdk.package.lisp" + (("libgtk" all) + (string-append (assoc-ref inputs "gtk") "/lib/" all)))))= ))) (home-page "https://github.com/Ferada/cl-cffi-gtk/") (synopsis "Common Lisp binding for GTK+3") (description @@ -2889,192 +2923,155 @@ is a library for creating graphical user interfac= es.") (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-glib") (inputs =2D `(("glib" ,glib) =2D ("bordeaux-threads" ,sbcl-bordeaux-threads) + `(("bordeaux-threads" ,sbcl-bordeaux-threads) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "glib/cl-cffi-gtk-glib.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "glib/glib.init.lisp" =2D (("libglib|libgthread" all) =2D (string-append (assoc-ref inputs "glib") "/lib/" all))))= )))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "glib/cl-cffi-gtk-glib.asd"))))) =20 (define-public sbcl-cl-cffi-gtk-gobject (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gobject") (inputs =2D `(("glib" ,glib) =2D ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("trivial-garbage" ,sbcl-trivial-garbage) ("bordeaux-threads" ,sbcl-bordeaux-threads) ("closer-mop" ,sbcl-closer-mop) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "gobject/cl-cffi-gtk-gobject.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "gobject/gobject.init.lisp" =2D (("libgobject" all) (string-append =2D (assoc-ref inputs "glib") "/lib/" al= l))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-gobject"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "gobject/cl-cffi-gtk-gobject.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-gobject"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk-gio (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gio") (inputs =2D `(("glib" ,glib) =2D ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "gio/cl-cffi-gtk-gio.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "gio/gio.init.lisp" =2D (("libgio" all) =2D (string-append =2D (assoc-ref inputs "glib") "/lib/" all))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-gio"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "gio/cl-cffi-gtk-gio.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-gio"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk-cairo (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-cairo") (inputs =2D `(("cairo" ,cairo) =2D ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "cairo/cl-cffi-gtk-cairo.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "cairo/cairo.init.lisp" =2D (("libcairo" all) =2D (string-append =2D (assoc-ref inputs "cairo") "/lib/" all))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-cairo"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "cairo/cl-cffi-gtk-cairo.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-cairo"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk-pango (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-pango") (inputs =2D `(("pango" ,pango) =2D ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-cairo" ,sbcl-cl-cffi-gtk-cairo) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "pango/cl-cffi-gtk-pango.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "pango/pango.init.lisp" =2D (("libpango" all) =2D (string-append =2D (assoc-ref inputs "pango") "/lib/" all))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-pango"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "pango/cl-cffi-gtk-pango.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-pango"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk-gdk-pixbuf (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk-pixbuf") (inputs =2D `(("gdk-pixbuf" ,gdk-pixbuf) =2D ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) + `(("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "gdk-pixbuf/gdk-pixbuf.init.lisp" =2D (("libgdk_pixbuf" all) =2D (string-append =2D (assoc-ref inputs "gdk-pixbuf") "/lib/" all))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-gdk-pixbuf"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-gdk-pixbuf"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk-gdk (package (inherit sbcl-cl-cffi-gtk-boot0) (name "sbcl-cl-cffi-gtk-gdk") (inputs =2D `(("gtk" ,gtk+) =2D ("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) + `(("cl-cffi-gtk-glib" ,sbcl-cl-cffi-gtk-glib) ("cl-cffi-gtk-gobject" ,sbcl-cl-cffi-gtk-gobject) ("cl-cffi-gtk-gio" ,sbcl-cl-cffi-gtk-gio) ("cl-cffi-gtk-gdk-pixbuf" ,sbcl-cl-cffi-gtk-gdk-pixbuf) @@ -3082,32 +3079,23 @@ is a library for creating graphical user interfaces= .") ("cl-cffi-gtk-pango" ,sbcl-cl-cffi-gtk-pango) ,@(package-inputs sbcl-cl-cffi-gtk-boot0))) (arguments =2D `(#:asd-file "gdk/cl-cffi-gtk-gdk.asd" =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'unpack 'fix-paths =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* "gdk/gdk.init.lisp" =2D (("libgdk" all) =2D (string-append =2D (assoc-ref inputs "gtk") "/lib/" all))) =2D (substitute* "gdk/gdk.package.lisp" =2D (("libgtk" all) =2D (string-append =2D (assoc-ref inputs "gtk") "/lib/" all))))) =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk-gdk"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "gdk/cl-cffi-gtk-gdk.asd") + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk-gdk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public sbcl-cl-cffi-gtk (package @@ -3122,26 +3110,27 @@ is a library for creating graphical user interfaces= .") (native-inputs `(("fiveam" ,sbcl-fiveam))) (arguments =2D `(#:asd-file "gtk/cl-cffi-gtk.asd" =2D #:test-asd-file "test/cl-cffi-gtk-test.asd" + (substitute-keyword-arguments (package-arguments sbcl-cl-cffi-gtk-boo= t0) + ((#:asd-file _ "") "gtk/cl-cffi-gtk.asd") + ((#:test-asd-file _ "") "test/cl-cffi-gtk-test.asd") ;; TODO: Tests fail with memory fault. ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24. =2D #:tests? #f =2D #:phases =2D (modify-phases %standard-phases =2D (add-after 'install 'link-source =2D ;; Since source is particularly heavy (16MiB+), let's reuse it =2D ;; across the different components of cl-ffi-gtk. =2D (lambda* (#:key inputs outputs #:allow-other-keys) =2D (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") =2D "/share/common-lisp/sbcl-= source/" =2D "cl-cffi-gtk-glib")) =2D (out-source (string-append (assoc-ref outputs "out") =2D "/share/common-lisp/sbcl-s= ource/" =2D "cl-cffi-gtk"))) =2D (delete-file-recursively out-source) =2D (symlink glib-source out-source) =2D #t)))))))) + ((#:tests? _ #f) #f) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'link-source + ;; Since source is particularly heavy (16MiB+), let's reuse it + ;; across the different components of cl-ffi-gtk. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((glib-source (string-append (assoc-ref inputs "cl-cff= i-gtk-glib") + "/share/common-lisp/sbcl-= source/" + "cl-cffi-gtk-glib")) + (out-source (string-append (assoc-ref outputs "out") + "/share/common-lisp/sbcl-s= ource/" + "cl-cffi-gtk"))) + (delete-file-recursively out-source) + (symlink glib-source out-source) + #t))))))))) =20 (define-public cl-cffi-gtk (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) =2D-=20 2.25.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl62btUACgkQm9z0l6S7 zH9YhQgAi8RFu/PRQ4hemyvvklIO4ZkhYMZlKTfO0DaG+WSajqqyKfRjHj3FSFZI bJan1FVicVPLxXhSnrOOVsMrzA2MBJtYeukigsrhiUOBGoPNAqn+rxNj+SBgGOWZ gqWMVSyswUd52zSs1NSEncEY+Ih73AiN+oSGTQcywC3+Z9kcmoegHaM22SNmTWoG yFse4qS9XqhjGGnU1Ghjw264cnFobGZWZbOE+S46sZ24h3GSmwOApH6FdG2pKu1l rD8cF+2n+95QnLZdcecBxaX67I++Rbh9Rbpn6NzS9Qxdw69iQf+G60/LaHkaWJYs dnJmuowZqAWC1CX0P1v43pBRcEzXBg== =+rZ8 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 21 05:54:12 2020 Received: (at 41135) by debbugs.gnu.org; 21 May 2020 09:54:12 +0000 Received: from localhost ([127.0.0.1]:55363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbhu0-000172-Ay for submit@debbugs.gnu.org; Thu, 21 May 2020 05:54:12 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:41419) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbhty-00016m-Jv for 41135@debbugs.gnu.org; Thu, 21 May 2020 05:54:11 -0400 Received: from mimimi (mqu44-1-78-248-96-161.fbx.proxad.net [78.248.96.161]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id C5488200005 for <41135@debbugs.gnu.org>; Thu, 21 May 2020 09:54:03 +0000 (UTC) From: Pierre Neidhardt To: 41135@debbugs.gnu.org Subject: Re: bug#41135: Acknowledgement ([PATCH 1/3] build: asdf-build-system: Use SBCL source in CL packages.) In-Reply-To: <87k11ms7sr.fsf@ambrevar.xyz> References: <20200508064827.1270-1-mail@ambrevar.xyz> <87k11ms7sr.fsf@ambrevar.xyz> Date: Thu, 21 May 2020 11:54:02 +0200 Message-ID: <87sgftd35x.fsf@ambrevar.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 41135 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.2 (/) --=-=-= Content-Type: text/plain Merged with 0fadc00a1a5bfbb6ca9caf1bfae06e839684843c. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl7GT7oACgkQm9z0l6S7 zH9YNwf/T/Z2oB+WpiR0tl85DcveQhDoVHp2Bk4OM7htvNjqauYRKT6pomcMK2dg QNDmaYYUe50WDfhcx2pyWDYiEmnXZlRabHAE5PQtb35ojxdC+rrjzx4zTNbOD+4V NtaUIvYMnfBIo3igNqkVTKWo/bNkvE67VcxMVUtyzbaJRa57kcgSA4D1itBZ9TO+ pWnNebVR+KRvqubzOEtf5vjvC5w9yzquJ5YM0zHcHleV8wTLhz9+BYtGFsZQHV9C Je7cj7sYarrqEziReF3Ph/qOkiGiXBRTxqy411dukuj4/3Lm2I1EkcGC6QcyFrEZ 1BBg5KjCngI7MuinPB7mbctifHeMpg== =OFU9 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 21 05:54:30 2020 Received: (at control) by debbugs.gnu.org; 21 May 2020 09:54:30 +0000 Received: from localhost ([127.0.0.1]:55366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbhuI-00017b-J3 for submit@debbugs.gnu.org; Thu, 21 May 2020 05:54:30 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:50897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jbhuH-00017O-B7 for control@debbugs.gnu.org; Thu, 21 May 2020 05:54:29 -0400 Received: from mimimi (mqu44-1-78-248-96-161.fbx.proxad.net [78.248.96.161]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 9F9E8200002 for ; Thu, 21 May 2020 09:54:23 +0000 (UTC) Date: Thu, 21 May 2020 11:54:23 +0200 Message-Id: <87r1vdd35c.fsf@ambrevar.xyz> To: control@debbugs.gnu.org From: Pierre Neidhardt Subject: control message for bug #41135 X-Spam-Score: 1.8 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 41135 quit Content analysis details: (1.8 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.178.232 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) close 41135 quit From unknown Sat Jun 21 10:43:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 18 Jun 2020 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator