From patchwork Wed May 7 05:59:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 42366 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 5479727BC49; Wed, 7 May 2025 07:00:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 3021527BC4B for ; Wed, 7 May 2025 07:00:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCXpA-0004WG-Vi; Wed, 07 May 2025 02:00:09 -0400 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 1uCXp7-0004TG-DU for guix-patches@gnu.org; Wed, 07 May 2025 02:00:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCXp7-0005yq-0Q for guix-patches@gnu.org; Wed, 07 May 2025 02:00:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fVK8YUha5Wp6uUaiWya11FA2FdVD5RHc/akVwVq+3l4=; b=k1O1hRs0pUzGDRegNMkyvHZZpb2alexUIG4c9lcAFb/dc2GFPd5d+zRgsYqd0LcCkZx1f0CGbAALsuEyCQfs8ArTwDJzsBEXHEmuz5n59/456LLveZD8E+GrfUIE4EBOIKFQRYnVguc+E/CVaMgO/bNvl3+ee5jtTk+jNhLWdrxKdeEs6wye//SNE+7WQOFCRZP5V6rSLAnIDpSkRnxE+MSs0GZIO6LDCVpqXt0sWu1OCtqJc1L+ZgFSYxTsQd97SAMQ5EvaLxhFSOVDsWe1tzrkpUmDJpaD85AUkWEh9QkvacNzpLUif6lMsLYEPfaSOeb3TJWRfE2iuOWf44b6Fw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCXp6-00050u-K1; Wed, 07 May 2025 02:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78294] [PATCH 3/4] gnu: stb: Support defining deprecated header packages. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 07 May 2025 06:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78294 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78294@debbugs.gnu.org Cc: aurtzy , aurtzy X-Debbugs-Original-Xcc: aurtzy Received: via spool by 78294-submit@debbugs.gnu.org id=B78294.174659760119205 (code B ref 78294); Wed, 07 May 2025 06:00:04 +0000 Received: (at 78294) by debbugs.gnu.org; 7 May 2025 06:00:01 +0000 Received: from localhost ([127.0.0.1]:38923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCXp2-0004z8-W0 for submit@debbugs.gnu.org; Wed, 07 May 2025 02:00:01 -0400 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:50198) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCXoz-0004yM-C6 for 78294@debbugs.gnu.org; Wed, 07 May 2025 01:59:57 -0400 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6f5440fcf81so5769516d6.0 for <78294@debbugs.gnu.org>; Tue, 06 May 2025 22:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746597591; x=1747202391; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fVK8YUha5Wp6uUaiWya11FA2FdVD5RHc/akVwVq+3l4=; b=mX01wUGXsMZcf/F9AeAKOzPDhklRqXbcgIwn+mqeQoY5MHEyP2wyf2g5kJmzop+auF t+Qn/ZhCs0czPfJI5DYPlrJF5UQ86eW/gOTM09076GE9fZYiVkcq7xOsQAjSmZAFzIVE CNFEXPSMvbGJVNbgbFXhdVRvzusfRT+wK+tOwUue4ct43rQoSYMThVV5pG4HJWTDk99U 347fDR8zSImpJxAkGCDdTaPUG6RVoAe/gHWODsQlKEY7Lt5q7Fpr77xIUQ9UTBMIgqN4 vddC+tdpbaLZx1uTFZv6oM+33eaFG2RM2frr7UPkkv5taJGNKKFKj2VFH+SkTJ1FxhCe TAqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746597591; x=1747202391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fVK8YUha5Wp6uUaiWya11FA2FdVD5RHc/akVwVq+3l4=; b=AzaVDGZdjLI+ba8e5CeFD2tIhC7di2H7nxqbuLgky/EsvhMzaqfPwght9S/Lzqr3Kg 09RXK7JwwmfiWpYuzZF+vdTnzRVkbk8uV1Jdd/11gTnmNUKrtOmKh0KgGwOxcPDoWM9V zsAQlKZe8DbzPSP9GbLc1B8rXE9UsqyagZzDuOh5iH/5uFH+eSkCMEENSXgsIvwbh+/O HK8E+ae/l1q+w4oGDi/1nx8gxOIZqtf0dlDnvPPZsOTVpghVXW97vXUgxMlP15iXLq0X wXYAFxLjftQ0BJex0gJRAYpLzkMseT4JCra/FHp/BUGie7jf9mISMDVgu6iDeMW0PdNC VoEA== X-Gm-Message-State: AOJu0YxBedYLV86H5sdBhj59yNogA6PFuLbgdt2Jhk73nhy4V4XzcNDv Sbf1q6KudNhUh8KFv6A0StKaPAfgmQx8wjeLWK7/HabRTbOaaL6m1gFypA== X-Gm-Gg: ASbGncv7GWOUoCoYgGqGiRn2PPOaPaGWLxJAi8YP7ruETd7b4UuHR9mGS2cNHme2FhK 2o/ZmlqyloBCuTXDxiUWwn3H3hIMYdDgIjPoBpiDyf4P2uVYoO/+Wef0i2KgxFnTm6m+wIqw+Rs VjgFfemc2LmGEwzsE0k2j4AtV0NS4Jc+V/IP8xEO7iKzmRiaEBt1aTtUZKmYavzfGQJrWFv3Ouw XuFFRPUih4I17NteQKJTjV7xCrLlj5GkVGPmWLRZJHUhJTS2ItnXI2oAlmiKFo4ZSHvx6n2yB15 R7rT0+qaXp89p4iOufv82UID772aucbOFPo= X-Google-Smtp-Source: AGHT+IFUnuQ/xSY+tjmh4J8I5uZ9wYH0ixq1DOkI9WG9UFytVD2x5yAO6qwQwuGK7KdYD1u/L1govQ== X-Received: by 2002:ad4:442b:0:b0:6f5:4711:2980 with SMTP id 6a1803df08f44-6f547113548mr51576d6.42.1746597590833; Tue, 06 May 2025 22:59:50 -0700 (PDT) Received: from localhost.localdomain ([2600:4808:a053:1800::7c1b]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6f542623f1esm9795636d6.8.2025.05.06.22.59.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 22:59:50 -0700 (PDT) From: aurtzy Date: Wed, 7 May 2025 01:59:10 -0400 Message-ID: <09d459743cf1c290962c8b2e75c9f81a219defb6.1746593989.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/stb.scm (stb)[arguments]<#:phases>: Modify 'install phase to include deprecated files in output. (make-stb-header-package): Support `deprecated?' keyword argument. (define-stb-header-package): Accept rest arguments and pass them to make-stb-header-package. Change-Id: I003dd5786e3bd22d00290d1935e21291e8529914 --- gnu/packages/stb.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gnu/packages/stb.scm b/gnu/packages/stb.scm index 395959608d..827cdb85a4 100644 --- a/gnu/packages/stb.scm +++ b/gnu/packages/stb.scm @@ -60,12 +60,16 @@ (define stb #f ; (invoke "make" "-C" "tests" "CC=gcc") )) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (files (make-regexp "\\.(c|h|md)$"))) - (for-each (lambda (file) - (install-file file out)) - (scandir "." (cut regexp-exec files <>))) + (lambda _ + (let* ((files-rx (make-regexp "\\.(c|h|md)$")) + (include-file? (cut regexp-exec files-rx <>)) + (deprecated-output (string-append #$output "/deprecated"))) + (for-each (cut install-file <> #$output) + (scandir "." include-file?)) + (mkdir-p deprecated-output) + (with-directory-excursion "deprecated" + (for-each (cut install-file <> deprecated-output) + (scandir "." include-file?))) #t)))))) (synopsis "Single file libraries for C/C++") (description @@ -74,7 +78,7 @@ (define stb ;; The user can choose either license. (license (list expat public-domain))))) -(define (make-stb-header-package name version description) +(define* (make-stb-header-package name version description #:key deprecated?) (package (inherit stb) (name name) @@ -88,19 +92,20 @@ (define (make-stb-header-package name version description) #:builder #~(begin (use-modules (guix build utils)) - (let ((stb #$(this-package-input "stb")) + (let ((headers-dir #$(file-append (this-package-input "stb") + (if deprecated? "/deprecated" ""))) (lib (string-join (string-split #$name #\-) "_")) (out #$output)) - (install-file (string-append stb "/" lib ".h") + (install-file (string-append headers-dir "/" lib ".h") (string-append out "/include")) #t)))) (description description))) (define-syntax define-stb-header-package (syntax-rules (description) - ((_ symbol name version (description text)) + ((_ symbol name version (description text) rest ...) (define-public symbol - (make-stb-header-package name version text))))) + (make-stb-header-package name version text rest ...))))) (define-stb-header-package stb-image "stb-image" "2.30"