[bug#40291] gnu: packages: java: Add libantlr3c

[bug#40291] gnu: packages: java: Add libantlr3c

[Raghav Gururajan]

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

Hello Guix!

Please find the attached patch to add "libantlr3c" package.

Regards,
RG.

[-- Attachment #2: libantlr3c.patch --]
[-- Type: application/octet-stream, Size: 1514 bytes --]

From 791e2392aaa9a3202db90c1e50340c38bd001504 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sat, 28 Mar 2020 14:21:35 -0400
Subject: [PATCH 6/6] gnu: packages: java: Add libantlr3c

* gnu/packages/java.scm (libantlr3c): New variable.
---
 gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 5154dc124e..400ef8795e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -105,6 +105,35 @@
 ;; build framework.  We then build the more recent JDKs Icedtea 2.x and
 ;; Icedtea 3.x.
 
+(define-public libantlr3c
+ (package
+  (name "libantlr3c")
+   (version "3.4")
+   (source
+    (origin
+     (method url-fetch)
+     (uri
+      (string-append "https://www.antlr3.org/download/C/"
+                     name "-" version ".tar.gz"))
+     (sha256
+      (base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
+ (build-system gnu-build-system)
+ (arguments
+  `(#:configure-flags
+    (list
+     "--enable-debuginfo"
+     "--enable-64bit"
+     "--enable-abiflags"
+     "--enable-antlrdebug"
+     "--enable-shared"
+     "--enable-static"
+     "--enable-fast-install")))
+ (synopsis "ANTLR C Library")
+ (description "LIBANTLR3C provides run-time C libraries for ANTLR3
+(ANother Tool for Language Recognition v3).")
+ (home-page "https://www.antlr3.org/")
+ (license license:bsd-3)))
+
 (define jikes
   (package
     (name "jikes")
-- 
2.26.0

[bug#40291] gnu: packages: java: Add libantlr3c

[Maxim Cournoyer]

Hello Raghav!

You'll find my review of this patch below.  For other readers, this is
needed in preparation of Linphone, which requires it through its
belle-sip dependency.

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> Hello Guix!
>
> Please find the attached patch to add "libantlr3c" package.
>
> Regards,
> RG.
>
> From 791e2392aaa9a3202db90c1e50340c38bd001504 Mon Sep 17 00:00:00 2001
> From: Raghav Gururajan <raghavgururajan@disroot.org>
> Date: Sat, 28 Mar 2020 14:21:35 -0400
> Subject: [PATCH 6/6] gnu: packages: java: Add libantlr3c

This should be: "gnu: Add libantlr3c."

> * gnu/packages/java.scm (libantlr3c): New variable.
> ---
>  gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
>
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index 5154dc124e..400ef8795e 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -105,6 +105,35 @@
>  ;; build framework.  We then build the more recent JDKs Icedtea 2.x and
>  ;; Icedtea 3.x.
>
> +(define-public libantlr3c
> + (package
> +  (name "libantlr3c")
> +   (version "3.4")
> +   (source
> +    (origin
> +     (method url-fetch)
> +     (uri
> +      (string-append "https://www.antlr3.org/download/C/"
> +                     name "-" version ".tar.gz"))
> +     (sha256
> +      (base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
> + (build-system gnu-build-system)
> + (arguments
> +  `(#:configure-flags
> +    (list
> +     "--enable-debuginfo"
> +     "--enable-64bit"

Is this really required? The default is "no".  If enabled, it probably
needs to be made conditional so that it is only enabled for 64 bits
architectures.

> +     "--enable-abiflags"
> +     "--enable-antlrdebug"
> +     "--enable-shared"
> +     "--enable-static"

If enabled, the static library should go to its own "static" output.

> +     "--enable-fast-install")))
> + (synopsis "ANTLR C Library")
> + (description "LIBANTLR3C provides run-time C libraries for ANTLR3
> +(ANother Tool for Language Recognition v3).")
> + (home-page "https://www.antlr3.org/")
> + (license license:bsd-3)))
> +

The indentation is off.  If you don't use Emacs for editing, you can run
the Emacs script provided by Guix like this:

./etc/indent-code.el gnu/packages/java.scm libantlr3c

Thanks!

Maxim

bug#40291: gnu: packages: java: Add libantlr3c

[Maxim Cournoyer]

Hi Raghav,

Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

> Hello Raghav!
>
> You'll find my review of this patch below.  For other readers, this is
> needed in preparation of Linphone, which requires it through its
> belle-sip dependency.
>
> "Raghav Gururajan" <raghavgururajan@disroot.org> writes:
>
>> Hello Guix!
>>
>> Please find the attached patch to add "libantlr3c" package.
>>
>> Regards,
>> RG.
>>
>> From 791e2392aaa9a3202db90c1e50340c38bd001504 Mon Sep 17 00:00:00 2001
>> From: Raghav Gururajan <raghavgururajan@disroot.org>
>> Date: Sat, 28 Mar 2020 14:21:35 -0400
>> Subject: [PATCH 6/6] gnu: packages: java: Add libantlr3c
>
> This should be: "gnu: Add libantlr3c."
>
>> * gnu/packages/java.scm (libantlr3c): New variable.
>> ---
>>  gnu/packages/java.scm | 29 +++++++++++++++++++++++++++++
>>  1 file changed, 29 insertions(+)
>>
>> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
>> index 5154dc124e..400ef8795e 100644
>> --- a/gnu/packages/java.scm
>> +++ b/gnu/packages/java.scm
>> @@ -105,6 +105,35 @@
>>  ;; build framework.  We then build the more recent JDKs Icedtea 2.x and
>>  ;; Icedtea 3.x.
>>
>> +(define-public libantlr3c
>> + (package
>> +  (name "libantlr3c")
>> +   (version "3.4")
>> +   (source
>> +    (origin
>> +     (method url-fetch)
>> +     (uri
>> +      (string-append "https://www.antlr3.org/download/C/"
>> +                     name "-" version ".tar.gz"))
>> +     (sha256
>> +      (base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
>> + (build-system gnu-build-system)
>> + (arguments
>> +  `(#:configure-flags
>> +    (list
>> +     "--enable-debuginfo"
>> +     "--enable-64bit"
>
> Is this really required? The default is "no".  If enabled, it probably
> needs to be made conditional so that it is only enabled for 64 bits
> architectures.

I've studied what Debian does, and they do conditionals based on the
host.  I could find a way to achieve this with Guix and pushed as commit
f1cf62f5dc.

>
>> +     "--enable-abiflags"
>> +     "--enable-antlrdebug"
>> +     "--enable-shared"
>> +     "--enable-static"
>
> If enabled, the static library should go to its own "static" output.

As discussed in #guix, I've disabled static libraries for now.  I've
also only used the flags which are specific to antlr3c and that need to
be changed from their default values, to keep the noise level as low as
possible.

With this, the base for Linphone is now merged and we can attack the
more interesting bits.

Thanks!

Maxim

[bug#40291] gnu: Add libantlr3c (v2)

[Raghav Gururajan]

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



[-- Attachment #2: libantlr3c-v2.patch --]
[-- Type: application/octet-stream, Size: 2438 bytes --]

From 8d902fb82ee830f99bed054dc5915ba2026b3b39 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 2 Apr 2020 00:07:29 -0400
Subject: [PATCH 20/20] gnu: Add libantlr3c

* gnu/packages/java.scm (libantlr3c): New variable.
---
 gnu/packages/java.scm | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 4d305aac49..be09cbd2e7 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -122,27 +122,13 @@
         (base32 "0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags (list "--enable-debuginfo" "--disable-static")
-       #:phases (modify-phases %standard-phases
-                  (replace 'configure
-                    (lambda* (#:key build target native-inputs inputs outputs
-                              (configure-flags '()) out-of-source? system
-                              #:allow-other-keys)
-                      (let ((configure (assoc-ref %standard-phases 'configure))
-                            (enable-64bit? (member system '("aarch64-linux"
-                                                            "x86_64-linux"
-                                                            "mips64el-linux"))))
-                        (configure #:build build #:target target
-                                   #:native-inputs native-inputs
-                                   #:inputs inputs #:outputs outputs
-                                   #:configure-flags `(,(if enable-64bit?
-                                                            "--enable-64bit"
-                                                            '())
-                                                       ,@configure-flags)
-                                   #:out-of-source? out-of-source?)))))))
+     `(#:configure-flags
+       (list
+        "--enable-64bit"                ; Missing stubs-32.h
+        "--disable-static")))           ; Not required
     (synopsis "ANTLR C Library")
-    (description "LIBANTLR3C provides run-time C libraries for ANTLR3 (ANother
-Tool for Language Recognition v3).")
+    (description "LIBANTLR3C provides run-time C libraries for ANTLR3
+(ANother Tool for Language Recognition v3).")
     (home-page "https://www.antlr3.org/")
     (license license:bsd-3)))
 
-- 
2.26.0