From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id qKWaHEj7CWeQVgEAqHPOHw:P1 (envelope-from ) for ; Sat, 12 Oct 2024 04:30:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id qKWaHEj7CWeQVgEAqHPOHw (envelope-from ) for ; Sat, 12 Oct 2024 06:30:00 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dPTjAIFp; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=LXo8OZXG; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728707400; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3iKZ1EW4vNKTtUZclJD2j2ylfg3TOEuB4WR4C5fHFx4=; b=rRkv1C/0dRhVgXpm+spEav4+HPkYWlF0IoSKr4ieTJ7YhTDEmKp++JcmCJ1qrHd/ccU9X0 Du4kPkhKXKm0T4D1n4YGqCv+dnZkRfSqGZTykJVCMUgJDK+39L7ixLIrBneLJVOzRL7s8H 4G1KKwqt89Bh1g8K2KyxMSpYCoAV1rUwyQ2+v4K6vQjIC4l0wGVBxRChVRqOeGBtGkDOH1 zvV/yWB2cMj4HNo8NvIumLZ3wMmSYsFmVcDXxIVUIe1+7dKR6gk+DHm8k74k+8sm9aQ/yn CGt+XKj9DjujeilSQHaMXQXa1CeHW/dMt8nW+sPeRVL7sVf+HoTAzZv/Lqr9jA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=dPTjAIFp; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=LXo8OZXG; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728707400; a=rsa-sha256; cv=none; b=cHo3G8U1zh754rjXhZ+Kb7rSrU0gCbiwKjBqn9bKj5X1dg4ZxJQpeNf4cJetiF0qfLt7Nq xSTJ9bvNlcyajEFOgztbRsRiGF+jSX/3QThAK2lV9aG9uxTSJvpYFkPujrlD0kqFJNA+o+ Dj4ZrDKAO7h5BH0Ov92x0NzRVhQTi1JvvJ7JvdHva4Xt4l0GPDGcWs9erPFOzkLDK9A4Je Ny0E4ujUWIgCQfIPEeeWuOSzA8t9AX53pebTxIvt8d50YANJfgVLS2u3VxVJOfLrpz+HYi N7IMjqVwqxli+vOVa5uEiNlyXuG/qDncVDskjPmkCA5hptJEQpK1EVmizy0rfg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6239A41353 for ; Sat, 12 Oct 2024 06:29:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1szTlK-0006hn-0h; Sat, 12 Oct 2024 00:29:54 -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 1szTlI-0006hE-FS for guix-patches@gnu.org; Sat, 12 Oct 2024 00:29:52 -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 1szTlI-0001NW-63 for guix-patches@gnu.org; Sat, 12 Oct 2024 00:29:52 -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=3iKZ1EW4vNKTtUZclJD2j2ylfg3TOEuB4WR4C5fHFx4=; b=dPTjAIFpWc5VmMId5nD6AWqHJRJwKOWl42uflKGz/I30YJcan2vbIAs4Ri/7kKPxENbhaNTLgsodu7egPxDUaAZlt6kWfWLPgmaajeHDGxKOZpTK6ojS9AVU9S0ik31vgHF0nMvG8q8kcntMRPb/NqNw3QFffaV6BOgSYTh5jcSjHlJpzfRe5+wMtaOUWsq4vGrdxVJG0/dpuKRfYQjGFPVWuRvPRYrgj0LbeYStYGsbvNatpP/H7MCIO5XsYUVG+7qfB6DcFVnE/XJMBvwO5zQw2xrivrREsCXLEthmgvUTck7wYlyhqdD8GUy3aigprJQseAf6viPJAQ/X8BFJtA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1szTlV-0000wM-Gn; Sat, 12 Oct 2024 00:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73754] [PATCH 3/5] gnu: Add cppp. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 12 Oct 2024 04:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73754 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73754@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 73754-submit@debbugs.gnu.org id=B73754.17287074003551 (code B ref 73754); Sat, 12 Oct 2024 04:30:05 +0000 Received: (at 73754) by debbugs.gnu.org; 12 Oct 2024 04:30:00 +0000 Received: from localhost ([127.0.0.1]:35992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szTlP-0000vC-7m for submit@debbugs.gnu.org; Sat, 12 Oct 2024 00:29:59 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:43123) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1szTlM-0000ui-KA for 73754@debbugs.gnu.org; Sat, 12 Oct 2024 00:29:58 -0400 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-20c8c50fdd9so14816075ad.0 for <73754@debbugs.gnu.org>; Fri, 11 Oct 2024 21:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728707316; x=1729312116; 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=3iKZ1EW4vNKTtUZclJD2j2ylfg3TOEuB4WR4C5fHFx4=; b=LXo8OZXGkdoeG1aq2FODbTweFduaztE/nuRTcIFDjK6/4++DS4w8H+uR7ps69sdSGg 6c4IxAi2TVjwshaKHvJUmCebG7bMr0EcmzrhBCYeBMHEetZyXw88w4rSBUke8dzorFxr QNASou4NrnxJ0p8uYGGNTInznXvbKEI8Ix8Cz1lhGO+nyAxvJ6KXZpdoz/ncY3Edh9h9 Bs2cW1VJsQbv1fuh9DQ4ZJlcn0szcm0rwtlxIOx4MCCHI9FVGuHcaVXD3uclBzQA8IKy lpdlmZBisetDrh5mx/5mvICBaVlOWAlAalX1f6h6mkZAWlufMk8CfNGTP2LuT6M9IWTJ LrwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728707316; x=1729312116; 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=3iKZ1EW4vNKTtUZclJD2j2ylfg3TOEuB4WR4C5fHFx4=; b=UYgWYM5H+Iqycfp1GRG3/DTEUHzZM0KAXBAGePjhKOMOqTKRXvgthlWoMwjFpT/+66 o9bC5Gjm09mz9u5CzEHwlyxkYcDruYTe5X8d84Bfbf5fGeOyAoxprwuPQUYMfTm0TSN8 7dhsLkYGJIs8J2nCXyDQwWD7dt3pKKU3mJEpe9o7WhhSMiactzunWQClslsFInJ6wAoi uyGQfGiH/BWXzR3Q/E1b5dj21ULVSGRTVgoaE4JwxYlNKwsVeGS5LiGnEgm3qTPKE6o8 wswb9LyOsoSMKyrvTmJ0PpA0NrK0N5T2hCoEfPHPyhuMArJS8gMMh2vP7XIdLQWKwD4h OfhA== X-Gm-Message-State: AOJu0YzNeCnjGUq/Ogzw1rnEYXAA+58Vv21QGdyOTYc0G/l2G3lOL2jN 5ztGWOWEMnGgVwCNRTyNx7XsucTQp8niydf0DDh4AP1hKkyFh98UDnTYdw== X-Google-Smtp-Source: AGHT+IEJfkcoTOUbK1e1oAp86V+JZj/4b2/YZgeVhfo4UJJ+btU3ZNO+ANxSPS5ia8kz+76scuAHUg== X-Received: by 2002:a17:903:41cc:b0:20b:a409:329 with SMTP id d9443c01a7336-20c80442c36mr147398155ad.5.1728707316159; Fri, 11 Oct 2024 21:28:36 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c8c36e814sm30913145ad.307.2024.10.11.21.28.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 21:28:35 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 12 Oct 2024 13:28:12 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 3.09 X-Spam-Score: 3.09 X-Migadu-Queue-Id: 6239A41353 X-TUID: p3acY29EbuIb * gnu/packages/c.scm (cppp): New variable. * gnu/packages/patches/cppp-build-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I7dc2215f4e57aec6356afa82d5740f78a64d3bab --- gnu/local.mk | 1 + gnu/packages/c.scm | 36 ++++++++++++++++++++- gnu/packages/patches/cppp-build-fixes.patch | 17 ++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cppp-build-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 05a8716063..e08ecc744c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1105,6 +1105,7 @@ dist_patch_DATA = \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/cppcheck-disable-char-signedness-test.patch \ %D%/packages/patches/cppdap-add-CPPDAP_USE_EXTERNAL_GTEST_PACKAGE.patch\ + %D%/packages/patches/cppp-build-fixes.patch \ %D%/packages/patches/cpulimit-with-glib-2.32.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crc32c-unbundle-googletest.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7c93676f0c..01bfb7eec5 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday -;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2020, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2021 David Dashyan ;;; Copyright © 2021 Foo Chuan Wei @@ -140,6 +140,40 @@ (define-public c-rrb slicing.") (license license:boost1.0)))) +(define-public cppp + ;; No release; use the latest commit. + (let ((commit "49ccb2162329c6619ab876c6d5765d9d0ac24f61") + (revision "0")) + (package + (name "cppp") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~breadbox/cppp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r3vin9p1ql4ddbszwsvx493h6n0knlgxzpkahdb4a4df1xpqr1s")) + (patches (search-patches "cppp-build-fixes.patch")))) + (arguments + (list + #:make-flags #~(list (string-append "prefix=" #$output) + #$(string-append "CC=" (cc-for-target))) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) ;no configure script + (build-system gnu-build-system) + (home-page "https://www.muppetlabs.com/~breadbox/software/cppp.html") + (synopsis "Partial preprocessor for C") + (description "@command{cppp} is a partial preprocessor for C/C++ code. +It implements enough of the C preprocessor to identify the preprocessor +statements @code{#if}, @code{#ifdef}, et al., and applies their effects for +the identifiers that are specified on the command-line. Preprocessor +statements using identifiers not specified by the user are passed through +without modification; no other part of the input is altered.") + (license license:gpl2+)))) + (define-public cproc (let ((commit "70fe9ef1810cc6c05bde9eb0970363c35fa7e802") (revision "1")) diff --git a/gnu/packages/patches/cppp-build-fixes.patch b/gnu/packages/patches/cppp-build-fixes.patch new file mode 100644 index 0000000000..c46be950d8 --- /dev/null +++ b/gnu/packages/patches/cppp-build-fixes.patch @@ -0,0 +1,17 @@ +Upstream-status: Submitted to the author via email. + +diff --git a/Makefile b/Makefile +index b4f404d..cbf7cae 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,8 +28,8 @@ ppproc.o : ppproc.c ppproc.h gen.h types.h error.h symset.h mstr.h \ + cppp.o : cppp.c gen.h types.h unixisms.h error.h symset.h ppproc.h + + install: +- cp ./cppp $(prefix)/bin/. +- cp ./cppp.1 $(prefix)/share/man/man1/. ++ install -D ./cppp $(prefix)/bin/cppp ++ install -D ./cppp.1 $(prefix)/share/man/man1/cppp.1 + + test: cppp + ./tests/testall -- 2.46.0