From patchwork Tue Mar 14 07:02:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 10959 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 36DD816EA5; Tue, 14 Mar 2023 07:03:32 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 668E716E4E for ; Tue, 14 Mar 2023 07:03:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pbyga-0003ev-FT; Tue, 14 Mar 2023 03:03: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 1pbygZ-0003dX-16 for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pbygY-0005cf-Ii for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pbygY-0007vZ-DK for guix-patches@gnu.org; Tue, 14 Mar 2023 03:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62178] [PATCH 2/5] gnu: Add futil. References: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> In-Reply-To: <00c2af06-fa2f-81d3-e3de-444eaf232732@disroot.org> Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Mar 2023 07:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62178 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62178@debbugs.gnu.org Cc: Liliana Marie Prikler , iyzsong@envs.net Received: via spool by 62178-submit@debbugs.gnu.org id=B62178.167877736030437 (code B ref 62178); Tue, 14 Mar 2023 07:03:02 +0000 Received: (at 62178) by debbugs.gnu.org; 14 Mar 2023 07:02:40 +0000 Received: from localhost ([127.0.0.1]:36103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbygB-0007ul-Uv for submit@debbugs.gnu.org; Tue, 14 Mar 2023 03:02:40 -0400 Received: from knopi.disroot.org ([178.21.23.139]:35848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pbyg7-0007uZ-UL for 62178@debbugs.gnu.org; Tue, 14 Mar 2023 03:02:36 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4FE6A444AD; Tue, 14 Mar 2023 08:02:35 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id k5glQ6pGxYjr; Tue, 14 Mar 2023 08:02:33 +0100 (CET) Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678777353; bh=i9HjcUKA/7s3JW6KUl/OTdMUT/m9kkKCtgYyrYkL1DI=; h=Date:To:Cc:From:Subject; b=YlKhD8rJ5FbdOiufnWf+GeH2tzbCZpSeOj1A7iELmGEioehA1f34TU8q9W8HdeXBA Fta/Jfm5oWItOYUltvoEwnMLLohIhdr+3iOJTKTUvMrwGyBOASBQZlfRhgTDacPbkZ 0Jbw/WUjIQATf3gtPHNh1ujlKpM59BcatFtU+cOIhep1iMA7wERoGM86cIF3beY+qv nOScjkwWEDiw8MtnzM0J3F0sWOdkW1KL1zTdhfVJNOQFgBj/Um3K4XEGleWr60Qveq RzA6up+s1JA3BttXLb6E6DzztFAkLaIvnMs0hn7TLvzUuBtxhZhnoAN3rz8fXZq7EK FXv1wNdCda3gw== Date: Tue, 14 Mar 2023 15:02:30 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 ca7eeb834e5b53667d0ec945454d80794ee2a717 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 14 Mar 2023 13:55:09 +0800 Subject: [PATCH 2/5] gnu: Add futil. * gnu/packages/cpp.scm (futil): New variable. * gnu/packages/patches/futil-Add-Makefile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 38 ++++++++ gnu/packages/patches/futil-Add-Makefile.patch | 91 +++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 gnu/packages/patches/futil-Add-Makefile.patch diff --git a/gnu/local.mk b/gnu/local.mk index c2521acf02..1bdbddce5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1133,6 +1133,7 @@ dist_patch_DATA = \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/fuse-glibc-2.34.patch \ %D%/packages/patches/fuse-overlapping-headers.patch \ + %D%/packages/patches/futil-Add-Makefile.patch \ %D%/packages/patches/fxdiv-system-libraries.patch \ %D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \ %D%/packages/patches/ganeti-disable-version-symlinks.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ed6ae69198..69cda8aacc 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1216,6 +1216,44 @@ (define-public folly (supported-systems '("aarch64-linux" "x86_64-linux")) (license license:asl2.0))) +(define-public futil + (let ((commit "83fcf85cf7638947a44657b2f334c2d8a2d5d02d") + (revision "0")) + (package + (name "futil") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/hydren/futil") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05vyx6n4aqix3w1z76hal9zxzixfxnlw0cg4b06lc1l9gnw6ja71")) + (patches + (search-patches "futil-Add-Makefile.patch")) + (modules '((guix build utils))) + (snippet + #~(begin + (for-each + (lambda (file) + (install-file file "include/futil")) + (find-files "." "\\.h")))))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) + #:make-flags + #~(list (string-append "DESTDIR=" #$output) + "PREFIX="))) + (home-page "https://gitlab.com/hydren/futil") + (synopsis "C++ utility code library") + (description "Futil is a set of C++ utility code and library headers.") + (license license:zlib)))) + (define-public poco (package (name "poco") diff --git a/gnu/packages/patches/futil-Add-Makefile.patch b/gnu/packages/patches/futil-Add-Makefile.patch new file mode 100644 index 0000000000..2c5760d31b --- /dev/null +++ b/gnu/packages/patches/futil-Add-Makefile.patch @@ -0,0 +1,91 @@ +From 29c2ab3931bc0749fb72d222b14a629170cea9e6 Mon Sep 17 00:00:00 2001 +From: AwesomeAdam54321 +Date: Sun, 12 Mar 2023 00:47:56 +0800 +Subject: [PATCH] futil: Add Makefile. + +Adapted from https://gitlab.com/hydren/terrarium/-/blob/master/build/linux-gcc-sdl2-release/src_libs/futil/subdir.mk +--- + Makefile | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 71 insertions(+) + create mode 100644 Makefile + +diff --git a/Makefile b/Makefile +new file mode 100644 +index 0000000..39d2275 +--- /dev/null ++++ b/Makefile +@@ -0,0 +1,71 @@ ++################################################################################ ++# Automatically-generated file. Do not edit! ++################################################################################ ++ ++# Add inputs and outputs from these tool invocations to the build variables ++CPP_SRCS += \ ++exception.cpp \ ++properties.cpp \ ++stox.cpp \ ++string_actions.cpp \ ++string_extra_operators.cpp \ ++string_parse.cpp \ ++string_split.cpp ++ ++C_SRCS += \ ++chrono.c \ ++random.c \ ++round.c \ ++snprintf.c \ ++strtox.c ++ ++OBJS += \ ++chrono.so \ ++exception.so \ ++properties.so \ ++random.so \ ++round.so \ ++snprintf.so \ ++stox.so \ ++string_actions.so \ ++string_extra_operators.so \ ++string_parse.so \ ++string_split.so \ ++strtox.so ++ ++SRCDIR ?= . ++INCLUDE_PATH ?= ${SRCDIR}/include ++PREFIX ?= /usr/local ++ ++all: libfutil.so ++ ++libfutil.so: $(OBJS) $(USER_OBJS) ++ @echo 'Building target: $@' ++ @echo 'Invoking: GCC C++ Linker' ++ g++ -shared -o "libfutil.so" $(OBJS) $(USER_OBJS) $(LIBS) ++ @echo 'Finished building target: $@' ++ @echo ' ' ++ ++install: all ++ install -d $(DESTDIR)$(PREFIX) ++ cp -r include $(DESTDIR)$(PREFIX) ++ install -d $(DESTDIR)$(PREFIX)/lib ++ install -m 644 libfutil.so $(DESTDIR)$(PREFIX)/lib ++ ++%.so: %.c ++ @echo 'Building file: $<' ++ @echo 'Invoking: GCC C Compiler' ++ gcc -O3 -Wall -shared -fPIC -I${INCLUDE_PATH} -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" ++ @echo 'Finished building: $<' ++ @echo ' ' ++ ++%.so: %.cpp ++ @echo 'Building file: $<' ++ @echo 'Invoking: GCC C++ Compiler' ++ g++ -I${INCLUDE_PATH} -O3 -Wall -shared -fPIC -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<" ++ @echo 'Finished building: $<' ++ @echo ' ' ++ ++clean: ++ rm $(wildcard *.so) ++ +-- +2.39.2 +