From patchwork Sat Nov 19 10:33:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 44617 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BB56E27BBED; Sat, 19 Nov 2022 10:34:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F9D327BBEC for ; Sat, 19 Nov 2022 10:34:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owLAl-0001RO-M2; Sat, 19 Nov 2022 05:34:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owLAg-0001Qw-CA for guix-patches@gnu.org; Sat, 19 Nov 2022 05:34:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owLAg-0007He-3R for guix-patches@gnu.org; Sat, 19 Nov 2022 05:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owLAf-0007HX-MY for guix-patches@gnu.org; Sat, 19 Nov 2022 05:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57625] [PATCH v2 1/3] gnu: Add libgc-all-headers. References: <9d424667-868f-03f2-c521-8c10e106d6d3@disroot.org> In-Reply-To: <9d424667-868f-03f2-c521-8c10e106d6d3@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 10:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57625 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 57625@debbugs.gnu.org Received: via spool by 57625-submit@debbugs.gnu.org id=B57625.166885402327965 (code B ref 57625); Sat, 19 Nov 2022 10:34:01 +0000 Received: (at 57625) by debbugs.gnu.org; 19 Nov 2022 10:33:43 +0000 Received: from localhost ([127.0.0.1]:39087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owLAK-0007Gu-Sz for submit@debbugs.gnu.org; Sat, 19 Nov 2022 05:33:43 -0500 Received: from knopi.disroot.org ([178.21.23.139]:45196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owLAE-0007Gf-Vf for 57625@debbugs.gnu.org; Sat, 19 Nov 2022 05:33:39 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8415D40DF3 for <57625@debbugs.gnu.org>; Sat, 19 Nov 2022 11:33:33 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c5YLQY2tLymy for <57625@debbugs.gnu.org>; Sat, 19 Nov 2022 11:33:32 +0100 (CET) Message-ID: <474de317-bfb9-7dd6-def7-daf953e96e33@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1668854012; bh=2u4QKIoqV8AwIgaFP+pw/9LTi2fBUW/HY76I4DL4B1Y=; h=Date:To:From:Subject:From; b=PQPevExwsA1GZDB3tjjlow+hLNuC5Tq/7OVd4ywv75m4/8ktiodiHw8OmkDGexxvx LH6ukERcrOR66F6dcFuTBEjLxrlJ6BBN9So6nGR16tEdQx0Qn/QvDt7a7VmvIRInYV qhExh71ABiMO7c5nn9FYA7scskmTn8dXkR4zrQO+bmlJhq3YWdvqVvHhGhrfsJ8Bwc BK5TRNt9DBxvnsLkZoXsJzHMZM2Rk3hpfteEasE0DAPsfuZNjCqPdxDN8WI9B+UTLh wrYrNmvXHX33YBnhJcUG8DGZ++oaiOV5IMr4v+MzQn6xboZ5GX9cAIuGgHUZLNaLnA EQT00bPxe0UBw== Date: Sat, 19 Nov 2022 18:33:28 +0800 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From 5ddddd9a24d9b319e722984e19ab26ba02779752 Mon Sep 17 00:00:00 2001 From: AwesomeAdam54321 Date: Fri, 18 Nov 2022 07:39:38 +0800 Subject: [PATCH v2 1/3] gnu: Add libgc-all-headers. * gnu/packages/bdw-gc.scm (libgc-all-headers): New variable. --- gnu/packages/bdw-gc.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) + (("#include .*/gc_mark.h.") "#include ")))))))) + (synopsis "Headers of libgc") + (description "All headers of libgc."))) + ;; TODO: Add a static output in libgc in the next rebuild cycle. (define-public libgc/static-libs (package/inherit diff --git a/gnu/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm index c812248e86..947a50f738 100644 --- a/gnu/packages/bdw-gc.scm +++ b/gnu/packages/bdw-gc.scm @@ -26,7 +26,9 @@ (define-module (gnu packages bdw-gc) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) + #:use-module (guix build-system copy) #:use-module (gnu packages pkg-config) #:use-module (gnu packages hurd)) @@ -90,6 +92,33 @@ (define-public libgc (license (x11-style (string-append home-page "license.txt"))))) +(define-public libgc-all-headers ; TODO(core-updates) merge into libgc + (package + (inherit libgc) + (name "libgc-all-headers") + (outputs '("out")) + (build-system copy-build-system) + (arguments + (list #:install-plan + #~'(("include/config.h.in" "include/private/config.h") + ("include/gc_tiny_fl.h" "include/private/gc_tiny_fl.h") + ("include/gc_mark.h" "include/private/gc_mark.h") + ("include/private/gcconfig.h" "include/private/gcconfig.h") + ("include/private/gc_hdrs.h" "include/private/gc_hdrs.h") + ("include/private/gc_atomic_ops.h" "include/private/gc_atomic_ops.h") + ("include/private/gc_locks.h" "include/private/gc_locks.h") + ("include/private/gc_priv.h" "include/private/gc_priv.h")) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'fix-headers + (lambda _ + (with-directory-excursion "include/private" + (substitute* "gc_priv.h" + (("#include .*/gc_tiny_fl.h.") "#include ")