diff mbox series

[bug#62178,v1,2/5] gnu: Add futil.

Message ID d6919530-2e0e-0895-7cb4-1c6523d80f68@disroot.org
State New
Headers show
Series None | expand

Commit Message

Adam Faiz March 16, 2023, 6:29 a.m. UTC 
From 53d9b1d0ab260a2b2aa4ee84dd00f97517c381db Mon Sep 17 00:00:00 2001
Message-Id: <53d9b1d0ab260a2b2aa4ee84dd00f97517c381db.1678947948.git.adam.faiz@disroot.org>
In-Reply-To: <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@disroot.org>
References: <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@disroot.org>
From: AwesomeAdam54321 <adam.faiz@disroot.org>
Date: Tue, 14 Mar 2023 13:55:09 +0800
Subject: [PATCH v1 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 | 92 +++++++++++++++++++
  3 files changed, 131 insertions(+)
  create mode 100644 gnu/packages/patches/futil-add-makefile.patch

Comments

Liliana Marie Prikler April 18, 2023, 4:55 p.m. UTC | #1 
Am Donnerstag, dem 16.03.2023 um 14:29 +0800 schrieb Adam Faiz:
>  From 53d9b1d0ab260a2b2aa4ee84dd00f97517c381db Mon Sep 17 00:00:00
> 2001
> Message-Id:
> <53d9b1d0ab260a2b2aa4ee84dd00f97517c381db.1678947948.git.adam.faiz@di
> sroot.org>
> In-Reply-To:
> <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@di
> sroot.org>
> References:
> <735f08bc3d271959685e03d761f5ac9039e5cfd3.1678947948.git.adam.faiz@di
> sroot.org>
> From: AwesomeAdam54321 <adam.faiz@disroot.org>
> Date: Tue, 14 Mar 2023 13:55:09 +0800
> Subject: [PATCH v1 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 | 92
> +++++++++++++++++++
>   3 files changed, 131 insertions(+)
>   create mode 100644 gnu/packages/patches/futil-add-makefile.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index c2521acf02..76129c9d82 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..5b146b3f4a 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(pp)?$"))))))
Is this snippet intended to go together with the patch?  If so, perhaps
you can adapt the patch to emit the renames as well or use a second
patch to do so rather than a snippet.
> +    (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=")))
Let PREFIX be #$output instead and leave DESTDIR empty.
> +    (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))))
> [...]

Cheers
diff mbox series

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index c2521acf02..76129c9d82 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..5b146b3f4a 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(pp)?$"))))))
+    (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..c580128f5e
--- /dev/null
+++ b/gnu/packages/patches/futil-add-makefile.patch
@@ -0,0 +1,92 @@ 
+From da31e9bb1abd95d81b4d4eb18888e41c30092fb9 Mon Sep 17 00:00:00 2001
+From: AwesomeAdam54321 <adam.faiz@disroot.org>
+Date: Sun, 12 Mar 2023 00:47:56 +0800
+Subject: [PATCH] futil: add makefile.
+
+Adapted from https://gitlab.com/hydren/terrarium/-/raw/master/build/linux-gcc-sdl2-release/src_libs/futil/subdir.mk
+---
+ Makefile | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 72 insertions(+)
+ create mode 100644 Makefile
+
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..a97ea48
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,72 @@
++################################################################################
++# 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.o \
++exception.o \
++properties.o \
++random.o \
++round.o \
++snprintf.o \
++stox.o \
++string_actions.o \
++string_extra_operators.o \
++string_parse.o \
++string_split.o \
++strtox.o
++
++SRCDIR ?= .
++INCLUDE_PATH ?= ${SRCDIR}/include
++PREFIX ?= /usr/local
++CFLAGS = -O3 -Wall -fPIC -c -fmessage-length=0 -MMD -MP
++
++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
++
++%.o: %.c
++	@echo 'Building file: $<'
++	@echo 'Invoking: GCC C Compiler'
++	gcc -I${INCLUDE_PATH} $(CFLAGS) -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
++	@echo 'Finished building: $<'
++	@echo ' '
++
++%.o: %.cpp
++	@echo 'Building file: $<'
++	@echo 'Invoking: GCC C++ Compiler'
++	g++ -I${INCLUDE_PATH} $(CFLAGS) -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
++	@echo 'Finished building: $<'
++	@echo ' '
++
++clean:
++	rm $(wildcard *.o) libfutil.so
++
+--
+2.39.2
+