all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / Atom feed
* [bug#46603] [PATCH 1/1] gnu: Add camlidl
@ 2021-02-17 22:56 Sharlatan Hellseher
  2021-04-06 21:58 ` bug#46603: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Sharlatan Hellseher @ 2021-02-17 22:56 UTC (permalink / raw)
  To: 46603

[-- Attachment #1: Type: text/plain, Size: 714 bytes --]

Hi Guix team!

I've got some extra packages to extend build of plplot (similar like
in Debian project
https://salsa.debian.org/science-team/plplot/-/blob/master/debian/control)

Related issues:
- https://issues.guix.gnu.org/46160
- https://issues.guix.gnu.org/46497

Workflow:
- https://github.com/Hellseher/guix-patches/blob/main/astronomy.org

--
… наш разум - превосходная объяснительная машина которая способна
найти смысл почти в чем угодно, истолковать любой феномен, но
совершенно не в состоянии принять мысль о непредсказуемости.

[-- Attachment #2: 0001-gnu-Add-camlidl.patch --]
[-- Type: text/x-patch, Size: 3524 bytes --]

From ce12e3783ad0e63a73a7ddc3471a0c82083b6283 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 17 Feb 2021 22:45:08 +0000
Subject: [PATCH] gnu: Add camlidl

* gnu/packages/ocaml.scm (camlidl): New variable.
---
 gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index dec1f8405e..335fec50f0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2020 divoplade <d@divoplade.fr>
 ;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>
 ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm>
+;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -251,6 +252,70 @@ functional, imperative and object-oriented styles of programming.")
 for building OCaml library and programs.")
     (license license:lgpl2.1+)))
 
+(define-public camlidl
+  (package
+    (name "camlidl")
+    (version "1.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/xavierleroy/camlidl")
+             (commit "camlidl109")))
+       (sha256
+        (base32 "0zrkaq7fk23b2b9vg6jwdjx7l0hdqp4synbbrw1zcg8gjf6n3c80"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;; No test suite
+       #:make-flags
+       (list
+        (string-append
+         "BINDIR=" (assoc-ref %outputs "out") "/bin")
+        (string-append
+         "OCAMLLIB=" (assoc-ref %outputs "out") "/lib/ocaml/site-lib/camlidl"))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'build
+           (lambda _
+             (let* ((cores  (parallel-job-count))
+                    (dash-j (format #f "-j~a" cores)))
+               (copy-file "config/Makefile.unix" "config/Makefile")
+               (invoke "make" dash-j "all"))
+             #t))
+         (add-before 'install 'create-target-directories
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (string-append (assoc-ref outputs "out"))))
+               (mkdir-p
+                (string-append out "/bin"))
+               (mkdir-p
+                (string-append out "/lib/ocaml/site-lib/camlidl/stublibs"))
+               (mkdir-p
+                (string-append out "/lib/ocaml/site-lib/camlidl/caml")))
+             #t))
+         (add-after 'install 'install-meta
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (with-output-to-file
+                   (string-append out "/lib/ocaml/site-lib/camlidl/META")
+                 (lambda _
+                   (display
+                    (string-append
+                     "description = \"Stub code generator for OCaml/C interface\"
+version = \"" ,version "\"
+directory = \"^\"
+archive(byte) = \"com.cma\"
+archive(native) = \"com.cmxa\"")))))
+             #t)))))
+    (native-inputs
+     `(("ocaml" ,ocaml)))
+    (home-page "https://github.com/xavierleroy/camlidl")
+    (synopsis "Stub code generator for OCaml/C interface")
+    (description
+     "Camlidl is a stub code generator for Objective Caml.  It generates stub
+code for interfacing Caml with C from an IDL description of the C functions.")
+    (license license:lgpl2.1)))
+
 (define-public ocaml-extlib
   (package
     (name "ocaml-extlib")
-- 
2.30.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* bug#46603: [PATCH 1/1] gnu: Add camlidl
  2021-02-17 22:56 [bug#46603] [PATCH 1/1] gnu: Add camlidl Sharlatan Hellseher
@ 2021-04-06 21:58 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2021-04-06 21:58 UTC (permalink / raw)
  To: Sharlatan Hellseher; +Cc: 46603-done

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

Hi Sharlatan,

Sharlatan Hellseher <sharlatanus@gmail.com> skribis:

> From ce12e3783ad0e63a73a7ddc3471a0c82083b6283 Mon Sep 17 00:00:00 2001
> From: Sharlatan Hellseher <sharlatanus@gmail.com>
> Date: Wed, 17 Feb 2021 22:45:08 +0000
> Subject: [PATCH] gnu: Add camlidl
>
> * gnu/packages/ocaml.scm (camlidl): New variable.

Applied with the minor changes below.  Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1365 bytes --]

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 82a2aac812..0948377d08 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -478,7 +478,8 @@ for building OCaml library and programs.")
              (url "https://github.com/xavierleroy/camlidl")
              (commit "camlidl109")))
        (sha256
-        (base32 "0zrkaq7fk23b2b9vg6jwdjx7l0hdqp4synbbrw1zcg8gjf6n3c80"))))
+        (base32 "0zrkaq7fk23b2b9vg6jwdjx7l0hdqp4synbbrw1zcg8gjf6n3c80"))
+       (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ;; No test suite
@@ -493,10 +494,10 @@ for building OCaml library and programs.")
          (delete 'configure)
          (replace 'build
            (lambda _
-             (let* ((cores  (parallel-job-count))
-                    (dash-j (format #f "-j~a" cores)))
-               (copy-file "config/Makefile.unix" "config/Makefile")
-               (invoke "make" dash-j "all"))
+             (copy-file "config/Makefile.unix" "config/Makefile")
+             ;; Note: do not pass '-jN' as this appears to not be
+             ;; parallel-safe (race condition related to libcamlidl.a).
+             (invoke "make" "all")
              #t))
          (add-before 'install 'create-target-directories
            (lambda* (#:key outputs #:allow-other-keys)

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-04-06 22:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-17 22:56 [bug#46603] [PATCH 1/1] gnu: Add camlidl Sharlatan Hellseher
2021-04-06 21:58 ` bug#46603: " Ludovic Courtès

all messages for Guix-related lists mirrored at yhetil.org

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix

Example config snippet for mirrors.


AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git