From patchwork Thu Oct 13 21:04:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Elsing X-Patchwork-Id: 43392 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 E968527BBEA; Thu, 13 Oct 2022 22:08:29 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8C69927BBE9 for ; Thu, 13 Oct 2022 22:08:29 +0100 (BST) Received: from localhost ([::1]:49754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oj5RM-0006Ga-ND for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 17:08:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oj5P3-00032L-CS for guix-patches@gnu.org; Thu, 13 Oct 2022 17:06:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oj5P1-0007Ua-C6 for guix-patches@gnu.org; Thu, 13 Oct 2022 17:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oj5P1-0005mj-7l for guix-patches@gnu.org; Thu, 13 Oct 2022 17:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58261] [PATCH v3 05/15] gnu: Add tinydir. Resent-From: David Elsing Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 21:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58261@debbugs.gnu.org Cc: David Elsing Received: via spool by 58261-submit@debbugs.gnu.org id=B58261.166569511522079 (code B ref 58261); Thu, 13 Oct 2022 21:06:03 +0000 Received: (at 58261) by debbugs.gnu.org; 13 Oct 2022 21:05:15 +0000 Received: from localhost ([127.0.0.1]:35143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oj5OE-0005k2-OF for submit@debbugs.gnu.org; Thu, 13 Oct 2022 17:05:15 -0400 Received: from mout01.posteo.de ([185.67.36.65]:33925) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oj5Nv-0005hD-0e for 58261@debbugs.gnu.org; Thu, 13 Oct 2022 17:04:55 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 831EE240028 for <58261@debbugs.gnu.org>; Thu, 13 Oct 2022 23:04:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1665695089; bh=WEjO2xUfGUfJHiDrGCqsm4gPn5KttkaWp62v4uzPXeY=; h=From:To:Cc:Subject:Date:From; b=Q7CZMvgBfKanTyKmyREjlGRfmCKhJI7aSriKuX3oLLv1xj8lPUSBgp5vUjcVMBTkX 8rHptbmQUW3ncm6mg4/KMGkpq5yyiSBw+ZrBbHuSMzlNsut/nNmunuQWupcOAW9Ygp BEc3azSHnTFXDjLATzFMBKNhG2voPlpfxMTAR5oUFFmdykNhKihq9x6azxqGH439wy H3cgPzFcLJpPxLtGaS7uSVhBwVmINSBGn8+pZaSzMr5t1XYnD6v2oKlVSX5RCydvOW pLByof4ur/UDgg91Jsk3+TrEOQuI+IcP9RzWO5t5xeBKU+pOekSCnSoQsM8MTvBsxY 943SJq7MS3nAw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MpMTs17V8z6tmB; Thu, 13 Oct 2022 23:04:49 +0200 (CEST) From: David Elsing Date: Thu, 13 Oct 2022 21:04:14 +0000 Message-Id: <20221013210424.993-6-david.elsing@posteo.net> In-Reply-To: <20221007152148.32591-1-david.elsing@posteo.net> References: <20221007152148.32591-1-david.elsing@posteo.net> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (tinydir): New variable. --- gnu/packages/cpp.scm | 41 +++++++++++++++++++ .../patches/tinydir-fix-cbehave-test.patch | 16 ++++++++ 2 files changed, 57 insertions(+) create mode 100644 gnu/packages/patches/tinydir-fix-cbehave-test.patch diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index b6a0a70ed7..7871660611 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -2093,3 +2093,44 @@ (define-public sajson (description "@code{sajson} is an in-place JSON parser with support for parsing with only a single memory allocation.") (license license:expat)))) + +(define-public tinydir + (package + (name "tinydir") + (version "1.2.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cxong/tinydir") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nprgdfx4i8wzc1idw6chan4fjfa75b5ll8kghdc0q2278pny259")) + (patches (search-patches "tinydir-fix-cbehave-test.patch")) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "tests/cbehave")))) + (build-system cmake-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'path-cmake + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("^include_dir.*cbehave.*") + (string-append "include_directories("#$cbehave "/include)")) + (("^add_subdir.*cbeha.*") "")))) + (add-before 'configure 'chdir + (lambda _ + (chdir "tests"))) + (replace 'install + (lambda _ + (install-file "../tinydir.h" + (string-append #$output "/include"))))))) + (native-inputs (list cbehave)) + (home-page "https://github.com/cxong/tinydir") + (synopsis "Directory listing wrapper") + (description "@code{tinydir} is a header-only C wrapper for listing +directory contents.") + (license license:bsd-2))) diff --git a/gnu/packages/patches/tinydir-fix-cbehave-test.patch b/gnu/packages/patches/tinydir-fix-cbehave-test.patch new file mode 100644 index 0000000000..84ecee12c2 --- /dev/null +++ b/gnu/packages/patches/tinydir-fix-cbehave-test.patch @@ -0,0 +1,16 @@ +Make test work with upstream cbehave +(tinydir bundles a modified version) + +diff --git a/tests/file_open_test.c b/tests/file_open_test.c +index 3e659bc..9f6f88d 100644 +--- a/tests/file_open_test.c ++++ b/tests/file_open_test.c +@@ -19,4 +19,7 @@ FEATURE(file_open, "File open") + SCENARIO_END + FEATURE_END + +-CBEHAVE_RUN("File open:", TEST_FEATURE(file_open)) ++int main(void) { ++ cbehave_feature _cfeatures[] = {{feature_idx(file_open)}}; ++ return cbehave_runner("File open:", _cfeatures); ++}