From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:5f26::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id 8I4KHLTNnGXPAwEAkFu2QA (envelope-from ) for ; Tue, 09 Jan 2024 05:38:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id GJHjGLTNnGUtDQEAqHPOHw (envelope-from ) for ; Tue, 09 Jan 2024 05:38:12 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tilde.club header.s=mail header.b=FkNmPvdn; 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)" header.from=tilde.club (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1704775092; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=KbUlIQOqDMkt3iyYWn0yuy9Zk6ZAueE5eto79R2A0Bk=; b=Ze8CzsR/0tsd/VVZ6u1ryF7lrNi+D/gsBrgX20gkBKcFu3ZReMYGmgf/VSl0DlchI2cour 8nm03/ygmcWkDY9btiOPVH18EOfKpd8Hho7vaLN3e8lnzNdumNYHtmxslGmhzYB3mIBOJO kmKRnVMU2VPJJUT0oBidVzGIXv8It2ugnPZm+swWXjBADwgouXsOaXca4H/hwX4avXslur J7vpzEnKmKr6GoKFOdk3OsjsMA/EbmrLzeo2ex9tK19yKm3ioXSXnoHLq6ALKtJnJqRpBv bRpkfE2giE1OhbXLtB+hbRIs75IMazMkFbCQW/EAwWVFXm0KHCjcyuAGBD4JYA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tilde.club header.s=mail header.b=FkNmPvdn; 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)" header.from=tilde.club (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1704775092; a=rsa-sha256; cv=none; b=LvwX8X9wT/Kl66nZZAqd1/jbZVc7vyq7h4+VkQqbjqy5h/Z4xo63vipOf7Ygzy6cpOIDGC KHugZq+L7gAbJDshIQcr45gRQtalxHage4PMBUCQpPw7EyXiqUF51seXiz6xs7whvg0T3O 6pp/8/9X+fHKYOiiT4jcI1mQX07Q46PQaYIAj/12WlcMUb4fjWXlm6B7M6bg/h8fyYJ+QO G+kDTR6LNaURSg4YTTNpoIFxA9HWTEaRQq3QhrQ3OqTj+fAQnGSNQ+ECFW5RBCLXK/CaVl Q4LzPs9OIKYOnc4pBnAFAOC8eF08YvGbuZk7WJ+SfzxuPA/ZdPkoCZBzSyGNAA== 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 473CB3F008 for ; Tue, 9 Jan 2024 05:38:12 +0100 (CET) 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 Content-Transfer-Encoding: quoted-printable 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: mx13.migadu.com X-Migadu-Spam-Score: -3.69 X-Spam-Score: -3.69 X-Migadu-Queue-Id: 473CB3F008 X-TUID: htgB3GrROuyw 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 =3D \ %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))))) =20 +(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/packa= ges/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=0D + */=0D + =0D ++#include =0D ++#include =0D + # include "jam.h"=0D + # include "lists.h"=0D + # include "execcmd.h"=0D +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 (/, //xx= x)=0D + */=0D + =0D ++# include =0D + # include "jam.h"=0D + # include "filesys.h"=0D + # include "pathsys.h"=0D +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 de= pends=0D + */=0D + =0D ++# include =0D + # include "jam.h"=0D + =0D + # include "lists.h"=0D --=20 2.41.0