From patchwork Tue Jan 9 04:35:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ulfvonbelow X-Patchwork-Id: 58689 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 4BE3427BBE9; Tue, 9 Jan 2024 04:38:14 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 5A6EA27BBE2 for ; Tue, 9 Jan 2024 04:38:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rN3sD-0007gf-Rx; Mon, 08 Jan 2024 23:37:57 -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 1rN3sC-0007ei-0A for guix-patches@gnu.org; Mon, 08 Jan 2024 23:37:56 -0500 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 1rN3sB-0000le-Nu for guix-patches@gnu.org; Mon, 08 Jan 2024 23:37:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rN3sI-0001kP-9I for guix-patches@gnu.org; Mon, 08 Jan 2024 23:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68337] [PATCH 1/2] gnu: Add ajam. Resent-From: striness@tilde.club Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Jan 2024 04:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68337 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68337@debbugs.gnu.org Cc: Ulf Herrman Received: via spool by 68337-submit@debbugs.gnu.org id=B68337.17047750366644 (code B ref 68337); Tue, 09 Jan 2024 04:38:02 +0000 Received: (at 68337) by debbugs.gnu.org; 9 Jan 2024 04:37:16 +0000 Received: from localhost ([127.0.0.1]:38047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN3rX-0001j6-Ps for submit@debbugs.gnu.org; Mon, 08 Jan 2024 23:37:16 -0500 Received: from tilde.club ([2607:5300:203:b92b::114]:48504 ident=postfix) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rN3rV-0001iy-O1 for 68337@debbugs.gnu.org; Mon, 08 Jan 2024 23:37:14 -0500 Received: by tilde.club (Postfix, from userid 5378) id ADA41226F39B5; Tue, 9 Jan 2024 04:37:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 tilde.club ADA41226F39B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tilde.club; s=mail; t=1704775026; bh=nogF3/drYpYsENWwZDmF+nDmOPiv1cfCHzsaxFh4lNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FkNmPvdnuJmgjlVOtk60c6/vFeDZeSaDQuBU5TmMP0rCVSptqMJowzqC43PMtVRIb 1qjz1zlru7aYZS6W9AfzVcHhQWyMzPNEw1FYjhXTGxbzQW8qaUQj9napkQoWjacNBq YlsDG8qkqlRIs6DKeRoAALNk0Ih81hagJwrDfYjE= From: striness@tilde.club Date: Mon, 8 Jan 2024 22:35:43 -0600 Message-ID: X-Mailer: git-send-email 2.41.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 From: Ulf Herrman * gnu/packages/build-tools.scm (ajam): New variable. * gnu/packages/patches/ajam-add-unistd-include.patch: New patch. * gnu/local.mk (dist_patch_DATA): register it. Change-Id: I6f093b3c215199d3a19bab66d77af3d2e79b3749 --- gnu/local.mk | 1 + gnu/packages/build-tools.scm | 30 +++++++++++++++ .../patches/ajam-add-unistd-include.patch | 37 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 gnu/packages/patches/ajam-add-unistd-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index 533b32a00b..436308c241 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -907,6 +907,7 @@ dist_patch_DATA = \ %D%/packages/patches/agda-stdlib-use-runhaskell.patch \ %D%/packages/patches/agg-am_c_prototype.patch \ %D%/packages/patches/agg-2.5-gcc8.patch \ + %D%/packages/patches/ajam-add-unistd-include.patch \ %D%/packages/patches/akonadi-paths.patch \ %D%/packages/patches/akonadi-not-relocatable.patch \ %D%/packages/patches/akonadi-timestamps.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 9e6ed6eec6..89fe9d903e 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -290,6 +290,36 @@ (define-public gn ;; X11 license. (license (list license:bsd-3 license:x11))))) +(define-public ajam + (package + (name "ajam") + (version "2.5.2-1.3.3") + (source (origin + (method url-fetch) + (uri (string-append "https://www.argyllcms.com/jam-" version ".tgz")) + (sha256 + (base32 + "09nadmqidbci0p0mlf7aw199yhc93n6028xq01vajklmsy5pdhsp")) + (patches + (search-patches "ajam-add-unistd-include.patch")))) + (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* "execunix.c" + (("\"/bin/sh\"") + (string-append "\"" (which "sh") "\""))))) + (add-before 'configure 'set-CC + (lambda _ + (setenv "CC" "gcc")))))) + (home-page "https://www.argyllcms.com/doc/Compiling.html") + (synopsis "Jam build tool prepatched for use in Argyllcms") + (description "Jam build tool prepatched for use in Argyllcms") + (license (license:non-copyleft "file://README.ORG")))) + (define-public meson (package (name "meson") diff --git a/gnu/packages/patches/ajam-add-unistd-include.patch b/gnu/packages/patches/ajam-add-unistd-include.patch new file mode 100644 index 0000000000..8c66f77b94 --- /dev/null +++ b/gnu/packages/patches/ajam-add-unistd-include.patch @@ -0,0 +1,37 @@ +diff --git a/execunix.c b/execunix.c +index 3ae4c76..469f8d7 100755 +--- a/execunix.c ++++ b/execunix.c +@@ -38,6 +38,8 @@ + * 12/27/02 (seiwald) - grist .bat file with pid for system uniqueness + */ + ++#include ++#include + # include "jam.h" + # include "lists.h" + # include "execcmd.h" +diff --git a/fileunix.c b/fileunix.c +index 4c9a5a6..871b752 100755 +--- a/fileunix.c ++++ b/fileunix.c +@@ -33,6 +33,7 @@ + * 12/30/02 (seiwald) - skip solaris' empty archive member names (/, //xxx) + */ + ++# include + # include "jam.h" + # include "filesys.h" + # include "pathsys.h" +diff --git a/make1.c b/make1.c +index 3f7f14a..66e61d1 100755 +--- a/make1.c ++++ b/make1.c +@@ -49,6 +49,7 @@ + * 12/03/02 (seiwald) - fix odd includes support by grafting them onto depends + */ + ++# include + # include "jam.h" + + # include "lists.h"