From patchwork Mon Jun 2 20:40:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 42983 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 DFB1327BC4A; Mon, 2 Jun 2025 21:47:21 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 7C85927BC49 for ; Mon, 2 Jun 2025 21:47:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMC3k-0002yo-Cb; Mon, 02 Jun 2025 16:47:04 -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 1uMC3i-0002yR-QC for guix-patches@gnu.org; Mon, 02 Jun 2025 16:47:02 -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 1uMC3i-00020D-F9 for guix-patches@gnu.org; Mon, 02 Jun 2025 16:47:02 -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:Date:From:To:Subject; bh=kxqvYfRfAggspFBvRER0HlmRfHIjk9/vBP3xMklWSi8=; b=XEhA/IrljWfR6PX9g11l6adL22jhfgFFRBoKXVKr2GEJybP0eBVY55jhOhKYO51E6XBTCOTXlzcF0fn7aCYqICnknci8ynISmSx2RubueVw7i2OsiSXlj+1i/beqEzRAyQkzh7zz/cWGmwTd8mg/lUgX3naS9cmn3ZKkBdk5gl4/NbdYOeI7lwDsMzEQ2TuY2IVzsMrqE2aEMYlDkptyZIHCrH5kUttQg2w4k8C91swbGXjQWb/JdgbOBs0LwW5sPQH2W+rT2Hyd9GHLx+aEfo8Wck7fqxY0tHmtq5JzwMYmuttayH06g8kmfM6gL6uk4g5gWJm0L7MwF8MloQHsMA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uMC3i-00030P-0g for guix-patches@gnu.org; Mon, 02 Jun 2025 16:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78675] [PATCH] gnu: tup: Update to 0.8. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jun 2025 20:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78675 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78675@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174889718211425 (code B ref -1); Mon, 02 Jun 2025 20:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jun 2025 20:46:22 +0000 Received: from localhost ([127.0.0.1]:55812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uMC33-0002y9-MU for submit@debbugs.gnu.org; Mon, 02 Jun 2025 16:46:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38866) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uMC30-0002xj-Ib for submit@debbugs.gnu.org; Mon, 02 Jun 2025 16:46:19 -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 1uMC2u-0002r1-Ba for guix-patches@gnu.org; Mon, 02 Jun 2025 16:46:12 -0400 Received: from mail-bn8nam12olkn2092.outbound.protection.outlook.com ([40.92.21.92] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uMC2r-0001yQ-R5 for guix-patches@gnu.org; Mon, 02 Jun 2025 16:46:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sAiTii8cOeNu4BCQ+xeOtBLcL/6aj9p/GeZ/cFJ3HH6NItisfE7OmYYByqB5j9XxxgAvTB8m7f55BZaRarwkdsGIn9BulypandpuCURHmsln4DvM7dHLcx58cKrY3hD4lgXJdRfAgDtoAJ/W2lrT3SSamsOl3vug6sySm1AxownRAhAxIjJyDImAapgq+cUVGWkeSQdd5TZ6r4KEEtLR9jSAdidCCryzVEWnekX6dh7/kexhbrc2z8lza/y3+Fg5jd/HgQahmtmreGn0Nlg/DbKbxK8LsyHco9R5VN0zcDMq/TWECzUP791mGJ8/LjGE2NZ2H4l0F+hvpgwQBBeN6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kxqvYfRfAggspFBvRER0HlmRfHIjk9/vBP3xMklWSi8=; b=svLJa6ngxM8TdVtbVd5rzegWrHiT6SyBbcB8ZeU3m686XRIWhLPHxizazLqyXlPZPF6LX3lmf8yDkzkNTc3IxTF6SGOiSx2nNJ2UoiClV+Dxg9iyAhduZBH7qyTQiGRb/YVWG+O5py9lHvTpu4TcSsfx2EMWUV5OgkeLCHlb/kYIa/VORIW7s5n+chuMX/YSleqqe3STPebWTcCFjyXoC8ncK5IoNIbZEU6V0AAVd8XXGLRjXh1viPow3k+KmqeHYQVf6k5DOqFehARHBY78qxzKWHPpdgbyI3HeLw3H4rY4ptrXkTax9WeEZtHriZm7tqWekVTslfbnguSX7+2P+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kxqvYfRfAggspFBvRER0HlmRfHIjk9/vBP3xMklWSi8=; b=aW0RlM2IFGsNrXuZkoMla32JyAF8b9iO/Qgo72JeRLHA/dH9LIHoMURqhyHaBfqfbMSekILnVMV9gX0GFl2eMEBMlhbdKi1RMuDny9xJZ6RiT6nTLf6GwApcLIiQC8eFapVjGcY6hNZX6sRAqS6RqCeuZadGVcyB/yIobO5wJIt64vTyYEutXUtsWrOnjaJum16qmUrpJaNAyglVC1fp/NMGOwhBb0GGRS8WA70L199P7pti7W8TX5P7BN23H8J1n8c3/eDw8qv8WZlA3MmRzQuoH45oCfkWZyD1kf5x8v5BnFMz6H+q9VFcu+imjs6HQ4jkHZH07eHeMX/zfXsSAw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SJ0PR84MB3221.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:a03:449::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.32; Mon, 2 Jun 2025 20:41:03 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%3]) with mapi id 15.20.8769.035; Mon, 2 Jun 2025 20:41:03 +0000 From: Morgan Smith Date: Mon, 2 Jun 2025 16:40:23 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: CH2PR07CA0033.namprd07.prod.outlook.com (2603:10b6:610:20::46) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <274c69351d1406c983c54316fdc77d52d7341c8b.1748896823.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SJ0PR84MB3221:EE_ X-MS-Office365-Filtering-Correlation-Id: b786a006-a3d4-4e43-270e-08dda215ca75 X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TWgBGe20qB0VxQ4h6UBNifKbmrLtFfZLzwX3ZPxk1iwgReDwS//LE0q12CY6TCWzkOO+5H7XosqdbsOE4fOs8FxZ/e44Rwi1ss2ltLAZ1rQ+DdZmVfGxPO/8ZwPRS1Iybl1WOGvcw7gXV4Ch/yBHUvGuRbho3XadCxDTXkgT/Cau4vsBT39UJOzw2nGE+yIi7kh9gWNX7sqr5bar23+XkXWIPqEEbKQCdnum4TlSfd52ziv3yxuoewgJwLG+XaP4kaawjqdBTtlxzzni0GKs0ovF3GCHaAhCG2M88h6fvpu1ypXP5yu7itjrWnzmIRrFxdvuGsBPeJSyvyednVqakA+O3D1liisZPwo/XaSCeO42EsoUgcWnc2yOS1eb/hv2QWlyIPKiXHdCuk+FOhPfQyjnBKORcmzPl1Eyaiv4j/kHOkhgSzzQ6DasaW9zh/dcEFHOBoLZ2qK1YRL0uirHU4eb791IkiCb/CKfhYzvCQ5VnGaPqVcQ+7QdFsuPAdUWGFZelVkGmA+p9FMjbPEQuCJBCq6AH4qffHbVl8gK3kgZJKHC/fe0k0FLVgKgY0g8mXGih2tHJ75iAI/w3420CjWxpkewEPeDej+ntTX0608jPS46B0B6dK8U2wEOrTF9x6KgPgzHD1PrW+8vKYczrEdaDZTw5eH3mRXQ0YLHuogp1X6GRZzk2WP5LRmsvDRr7WOi3sZJ1FFoUiTGH+EBMVpGYjJZngI6K8mJhL8u1WXQZzei0JqpPkmqFINnNq1mUv8NOoONcT90vy8JRSUcGTJOVCaKWTNCVg= X-Microsoft-Antispam: BCL:0; ARA:14566002|41001999006|7092599006|8060799009|19110799006|21061999006|15080799009|5072599009|461199028|440099028|3412199025|10035399007|56899033|1710799026; X-Microsoft-Antispam-Message-Info: uD/KxcpZjBb3bzwKD4vM8HfM0FlxcBjjNb+8QS4sRy56PyK+FhiT0Anb7OaiBSmgOS8rKURHr3msTf3rn93clEI6Hk2ccpeP/yTwWqzeRD670z/yWymj1xDA68rnI1eroQPN95uoGxM3bgweFUmn7rY3zuMiTWtbYqlSExrNgigUyqDhUEZlCnxqZriaydofHWayXh7v1rIdTW5PxwLeyNZNihVTNjXNIeRu7glSGM/HKuQGDLSgzsYyUdTcQdFbBjKJshP1wuGylufXzbuTVaeTsgDWEkwyxP+0gHMU1V5Lau5U5kZXSe06YshHgYTgO4VoYPZREbEHjiEHVtXk6K6OWq2fPaQ8HgO2dokjJ3+YQrbM0/BinodZkYgV/ky6amqjtLo9XHII6w58NAtE82CXvxtXjCx+t88NIZN79YxnYgGqskdrrxHRp6L7RqMfyayY1pFuLdt9d7AeDUI7e47LQMHDyQQvyoZAi6SR+xKUNRruoYN36xV0dtFB85CuqiecapVV52mKmDq0p1r/cTcbsqCJF+sQDdHFmQp8v/FnxXu7KrisI2VOEu3WEyGMGyGLe/ntfeahaGVq8dw84p7uljRTe6E83qZrXgk1EKGdqqSwy5PKTiH6+zhGTwA8FJAQs0PRIdAkeCa5TUk+pgFDMqKheKJ5vVx6kmx7BeE6xUUt60/UAb2JYHAi8DawWmMY9+0hwpRHz4TlnyKIYwDwqvDECBdUAIioRIVDrzoZFukH2Now0Byup3/EwlTAB5mhEEex4zANkJKtLTJjS1M0elcHJ3ixMVhEMET7oUIFrlA9fmEp9O16K4/6dh8dS3cZo5xAaXMKBvkMsiS239vOUAyLrm9lMyw9Y46cVn+xRFhODf5wcb6VvTW1TYP38mFDS+ZMrBQhB7DtQySEv8kDZyjMP6wmH0YRJADB56TaYh5NeIX6vh7Eio+dCvtDO735ZpX8g2oEDSvaUxlKnFkYiyAgC0+WIFApdShsLGCFkRFnU/5CvguQHS6uzJ2L/M/PeeEW67YyQF5ii32AQa0pVIjj0eBQN/9gJpmTzKWPc/IzFa3CDS8sQAwNZ9LQVuLU6s0fhX0UAHfCZ3Qv1qfL8yiAE8udsd8xaR98ilO2tITjGnv3PQPNTq2jb17j719RPLtuldCLDktW9j8+IeV61lD8AAN5Li7CxnCAKU4QgLIxA11UszGmgs6eR/7wxu3P6NAIVm9qtSLrGBaDxYmdgGynndGXlz+pS1MY8atzDuu4c4HnZHDkmKmelLYM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RVedFU0V1lZ1qDBy5RwNspaGbGf0A7bGEImObA/LDbVVcjVoK+YpAsDUxTooPh7GJWh7ScO/MtELr+LZemSdV6kneudo2r1zy9BuTk1FoZ6E5iEFX6HIBrUwdfWdmqpaah/RonXqdbRPI0PEM3nkCH6sjGkS54cL1x5pWyOWKkW1EHFR76KrrKhxQGo7vT/0wshJYwpg1cg9RW6LAQDAsFBFdiR5FYHDkxcUDqIUyl7HK/pIgRh/UNpzW++Oyi+PhpVCYyfUymqOWV6Enba0bje93w+hR1xXxjHasENtVo4IZDNOcdFniCClo1oBoauoxwq13Ux3qP7jy7jxXAMwn/itmLZDo/97Iw7/IgL7PtOBSuA8bVbJHcgWuj1Lwlnph7RDbIhvZoA3RVhMTK3KVKhFg5dpX2aroS/NbdDMr5lne4oCtIO5Zj7/LgN0jgj5+EEO8C1YJARz6jxWJgSrgaHOzhsC9ynIcBWhBGT/szQN4n308bdYOBF3oUER6IY+2ke73bBSU0dNeLU3q8igkS+8Sh0kuc4y4pvF58NMzN8ik5ldtDc7zleRYmY6GfErviXUAz1e1gr/4GJHATF8yNfvceYutcre9QeKWWBPUmxbW4h+8//ieinV+pNphPllX4XBZQyu364QgBEOiumLJS6iIkEwgnFO6D1+xpGcdHxnYNPS/lKve2nNwYigckMlvocUYE4Sco8jko6Eu2sgl7TBvC56/HrPuhhN9RYj9cY7jymyQP8p2PUVqucJn76BLbqL1pRtqn1i2SHeKlNC7R55zla9cZxGMCNP2qTAxoVmgEBHoHDxtKGZJcvP1LVuce/m51J7shxqw4LCgTSBbwYL2ri5F7Az4Je7QMnlFTi6DK7n429oYrdlXfHSgWCR4hPTwwnvKZQ6uRm8vs65kAjYTNE8tuVXh40sAZUDZqxfDMrRVsta0W64ye7Vz6n7SXsHZM4ulp+TUOu+NLpBxhr4mbeA9DV9XRg0ZF/JWSQP6NoGfaCqmGYJvIaw7mIa4UMLeuQaxPQqizDBXz6auMA6s0wFaqooGIVoR8QRlDIm2FIkSFS4sEgnT3+3ajVSZYYgyXcTxmjV6aod+M88ed2sxih/fjYG/oUtKxgA23+By+w0wAYfwb1yV5eJgvUM1h1c05RhEm/VTfytj0x4WR6Bpe/4MnUX1Vlj5O7Z268bPOwB4ftMGyyKDMTKHTDHZNOXTedxipzF7pUIZtJWrp7oG/A8kKwQzGivP00QkJtViJYW65CIrePhTmVc9ua3TIXkvX8paXxgzlfOK5bgNw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b786a006-a3d4-4e43-270e-08dda215ca75 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2025 20:41:03.6121 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR84MB3221 Received-SPF: pass client-ip=40.92.21.92; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM12-BN8-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/build-tools.scm (tup): Update to 0.8. Use gexps. : Update URL. Remove patch. : Adjust. : Update pcre to pcre2. Add libinih. : Add Lua license. * gnu/local.mk: Unregister patch. * gnu/packages/patches/tup-unbundle-dependencies.patch: Delete file. Change-Id: If8e55455bbf0dedc70611caf3247e169ad59c4d2 --- gnu/local.mk | 1 - gnu/packages/build-tools.scm | 108 ++++++++++-------- .../patches/tup-unbundle-dependencies.patch | 66 ----------- 3 files changed, 62 insertions(+), 113 deletions(-) delete mode 100644 gnu/packages/patches/tup-unbundle-dependencies.patch base-commit: d693603549c65a787b3d57e925ce826e23dfe557 diff --git a/gnu/local.mk b/gnu/local.mk index 2948bfb1bf..63aa4e6da6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2338,7 +2338,6 @@ dist_patch_DATA = \ %D%/packages/patches/transmission-4.0.6-fix-build.patch \ %D%/packages/patches/trytond-add-guix_trytond_path.patch \ %D%/packages/patches/ttf2eot-cstddef.patch \ - %D%/packages/patches/tup-unbundle-dependencies.patch \ %D%/packages/patches/turbovnc-custom-paths.patch \ %D%/packages/patches/turbovnc-find-system-packages.patch \ %D%/packages/patches/tuxpaint-stamps-path.patch \ diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index c0e67fed59..be33e0dc50 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -607,65 +607,79 @@ (define-public scons-python2 (define-public tup (package (name "tup") - (version "0.7.11") + (version "0.8") (source (origin (method url-fetch) - (uri (string-append "http://gittup.org/tup/releases/tup-v" + (uri (string-append "https://gittup.org/tup/releases/tup-v" version ".tar.gz")) (sha256 (base32 - "1157qfnhjakm3h07y7h38lrjw5650gkif34k30bnrsypmwl5xyzb")) - (patches (search-patches "tup-unbundle-dependencies.patch")) + "1yv60apd8dsigb74cjw1nzvqqqpjbsxz1i9dhq24jdkjwgsra3w4")) (modules '((guix build utils))) (snippet '(begin ;; NOTE: Tup uses a slightly modified Lua, so it cannot be - ;; unbundled. See: src/lula/tup-lua.patch + ;; unbundled. See: src/lua/tup-lua.patch (delete-file-recursively "src/pcre") (delete-file-recursively "src/sqlite3") - #t)))) + (delete-file-recursively "src/inih") + ;; ldpreload Used only on BSD. Deleting to avoid putting + ;; license:bsd-2 in the licenses field + (delete-file-recursively "src/ldpreload"))))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; There is a bootstrap script, but it doesn't do what you think - it - ;; builds tup. - (delete 'bootstrap) - (replace 'configure - (lambda _ - (substitute* "src/tup/link.sh" - (("`git describe`") ,version)) - (with-output-to-file "tup.config" - (lambda _ - (format #t "CONFIG_TUP_USE_SYSTEM_SQLITE=y~%"))) - #t)) - (delete 'check) - (replace 'build - (lambda _ - ;; Based on bootstrap-nofuse.sh, but with a detour to patch-shebang. - (invoke "./build.sh") - (invoke "./build/tup" "init") - (invoke "./build/tup" "generate" "--verbose" "build-nofuse.sh") - (patch-shebang "build-nofuse.sh") - (invoke "./build-nofuse.sh"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((outdir (assoc-ref outputs "out")) - (ftdetect (string-append outdir - "/share/vim/vimfiles/ftdetect"))) - (install-file "tup" (string-append outdir "/bin")) - (install-file "tup.1" (string-append outdir "/share/man/man1")) - (install-file "contrib/syntax/tup.vim" - (string-append outdir "/share/vim/vimfiles/syntax")) - (mkdir-p ftdetect) - (with-output-to-file (string-append ftdetect "/tup.vim") - (lambda _ - (display "au BufNewFile,BufRead Tupfile,*.tup setf tup"))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; There is a bootstrap script, but it doesn't do what you think - it + ;; builds tup. + (delete 'bootstrap) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "build.sh" + ;; LDFLAGS + (("-lm") "-lm -lsqlite3 -linih `pcre2-config --libs8`") + ;; CFLAGS + (("-DHAVE_CONFIG_H") "-DHAVE_CONFIG_H `pcre2-config --cflags`") + ;; Don't build bundled inih and pcre + (("\\.\\./src/inih/ini\\.c \\.\\./src/pcre/\\*\\.c") "") + ;; Don't build bundled sqlite3 + (("\\$CC \\$CFLAGS -c \\.\\./src/sqlite3/sqlite3\\.c.*") "")) + (substitute* "src/tup/option.c" + (("\"ini.h\"") "")) + (substitute* '("src/tup/tupid.h" + "src/tup/db.c") + (("sqlite3/sqlite3.h") + (search-input-file inputs "include/sqlite3.h"))) + (with-output-to-file "tup.config" + (lambda _ + (format #t (string-append "CONFIG_TUP_USE_SYSTEM_SQLITE=y~%" + "CONFIG_TUP_USE_SYSTEM_PCRE=y~%" + "CONFIG_TUP_USE_SYSTEM_INIH=y~%")))))) + (delete 'check) ; Most tests require fuse to be setup + (replace 'build + (lambda _ + ;; Based on bootstrap-nofuse.sh, but with a detour to patch-shebang. + (invoke "./build.sh") + (invoke "./build/tup" "init") + (invoke "./build/tup" "generate" "--verbose" "build-nofuse.sh") + (patch-shebang "build-nofuse.sh") + (invoke "./build-nofuse.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (ftdetect (string-append outdir + "/share/vim/vimfiles/ftdetect"))) + (install-file "tup" (string-append outdir "/bin")) + (install-file "tup.1" (string-append outdir "/share/man/man1")) + (install-file "contrib/syntax/tup.vim" + (string-append outdir "/share/vim/vimfiles/syntax")) + (mkdir-p ftdetect) + (with-output-to-file (string-append ftdetect "/tup.vim") + (lambda _ + (display "au BufNewFile,BufRead Tupfile,*.tup setf tup"))))))))) (inputs - (list fuse pcre - `(,pcre "bin") ; pcre-config - sqlite)) + (list fuse libinih pcre2 sqlite)) (native-inputs (list pkg-config)) (home-page "https://gittup.org/tup/") @@ -675,7 +689,9 @@ (define-public tup exact dependencies of the commands, allowing you to take advantage of ideal parallelism during incremental builds, and detecting any situations where a build worked by accident.") - (license license:gpl2))) + (license (list + license:gpl2 + license:x11)))) ; src/lua (define-public osc (package diff --git a/gnu/packages/patches/tup-unbundle-dependencies.patch b/gnu/packages/patches/tup-unbundle-dependencies.patch deleted file mode 100644 index 6409522bd3..0000000000 --- a/gnu/packages/patches/tup-unbundle-dependencies.patch +++ /dev/null @@ -1,66 +0,0 @@ -Allow building tup after removing some bundled sources from the source -tree. - -diff --git a/build.sh b/build.sh -index 2937116d..eab650f7 100755 ---- a/build.sh -+++ b/build.sh -@@ -16,7 +16,7 @@ else - echo "Error: invalid TUP_SERVER \"$server\"" 1>&2 - exit 1 - fi --LDFLAGS="$LDFLAGS -lm" -+LDFLAGS="$LDFLAGS -lm -lsqlite3 `pcre-config --libs`" - : ${CC:=gcc} - case "$os" in - Linux) -@@ -65,17 +65,15 @@ mkdir luabuiltin - - CFLAGS="$CFLAGS -DTUP_SERVER=\"$server\"" - CFLAGS="$CFLAGS -DHAVE_CONFIG_H" -+CFLAGS="$CFLAGS `pcre-config --cflags`" - --for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c ../src/pcre/*.c $plat_files; do -+for i in ../src/tup/*.c ../src/tup/tup/main.c ../src/tup/monitor/null.c ../src/tup/flock/fcntl.c ../src/inih/ini.c $plat_files; do - echo " bootstrap CC $CFLAGS $i" - # Put -I. first so we find our new luabuiltin.h file, not one built - # by a previous 'tup upd'. -- $CC $CFLAGS -c $i -I. -I../src -I../src/pcre $plat_cflags -+ $CC $CFLAGS -c $i -I. -I../src $plat_cflags - done - --echo " bootstrap CC $CFLAGS ../src/sqlite3/sqlite3.c" --$CC $CFLAGS -c ../src/sqlite3/sqlite3.c -DSQLITE_TEMP_STORE=2 -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION $plat_cflags -- - echo " bootstrap LD tup $LDFLAGS" - echo "const char *tup_version(void) {return \"$label\";}" | $CC -x c -c - -o tup_version.o - $CC *.o -o tup -lpthread $plat_ldflags $LDFLAGS -diff --git a/src/tup/db.c b/src/tup/db.c -index 55ee3edd..9bdf7a80 100644 ---- a/src/tup/db.c -+++ b/src/tup/db.c -@@ -46,7 +46,7 @@ - #include - #include - #include --#include "sqlite3/sqlite3.h" -+#include - - #define DB_VERSION 17 - #define PARSER_VERSION 12 -diff --git a/src/tup/tupid.h b/src/tup/tupid.h -index 7b36ae46..19aed438 100644 ---- a/src/tup/tupid.h -+++ b/src/tup/tupid.h -@@ -21,7 +21,7 @@ - #ifndef tup_tupid_h - #define tup_tupid_h - --#include "sqlite3/sqlite3.h" -+#include - - typedef sqlite3_int64 tupid_t; - --- -2.26.2 -