[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Thiago Jung Bauermann via Guix-patches via]

LuaJIT isn’t ported to powerpc64le. ‘texlive-latex-base’ already disables
them, so just do the same in texlive-texmf.

Fix suggested by Mathieu Othacehe <othacehe@gnu.org>.

* gnu/packages/tex.scm (texlive-texmf)[arguments]<#:phases>{texmf-config}:
Disable LuaJIT engines when building for powerpc64le.
---

Hello,

This fixes the build of ‘texlive-texmf’ on powerpc64le. It was failing
with these errors:

  fmtutil [ERROR]: not building luajittex due to missing engine: luajittex
  fmtutil [ERROR]: not building luajithbtex due to missing engine: luajithbtex

Thank you very much to Mathieu for his help in making  this work.

 gnu/packages/tex.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 70166941d554..3c0b87352a10 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6821,9 +6821,17 @@ directly generate PDF documents instead of DVI.")
                      (share (string-append out "/share"))
                      (texmfroot (string-append share "/texmf-dist/web2c"))
                      (texmfcnf (string-append texmfroot "/texmf.cnf"))
+                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
                      (texlive-bin (assoc-ref inputs "texlive-bin"))
                      (texbin (string-append texlive-bin "/bin"))
                      (tlpkg (string-append texlive-bin "/share/tlpkg")))
+                ;; LuaJIT is not ported to powerpc64le* yet.
+                (if (string-prefix? "powerpc64le"
+                                    ,(or (%current-target-system)
+                                        (%current-system)))
+                    (substitute* fmtutilcnf
+                      (("^(luajittex|luajithbtex|mfluajit)" m)
+                       (string-append "#! " m))))
                 ;; Register SHARE as TEXMFROOT in texmf.cnf.
                 (substitute* texmfcnf
                   (("TEXMFROOT = \\$SELFAUTOPARENT")

[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Mathieu Othacehe]

Hello,

> +                ;; LuaJIT is not ported to powerpc64le* yet.
> +                (if (string-prefix? "powerpc64le"
> +                                    ,(or (%current-target-system)
> +                                        (%current-system)))

Do you think we could use the "target-powerpc?" procedure from (guix
utils) here?

Mathieu

[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Thiago Jung Bauermann via Guix-patches via]

Hi Mathieu,

Thank you for the quick review.

Em terça-feira, 17 de agosto de 2021, às 09:42:53 -03, Mathieu Othacehe 
escreveu:
> Hello,
> 
> > +                ;; LuaJIT is not ported to powerpc64le* yet.
> > +                (if (string-prefix? "powerpc64le"
> > +                                    ,(or (%current-target-system)
> > +                                        (%current-system)))
> 
> Do you think we could use the "target-powerpc?" procedure from (guix
> utils) here?

‘target-powerpc?’ would also match 32-bit PowerPC. LuaJIT does support that 
platform, but I couldn’t find out – and can’t test – whether the LuaJIT TeX 
engines do as well.

Since ‘texlive-latex-base’ doesn’t exclude 32-bit PowerPC, I’d suggest 
doing the same for ‘texlive-texmf’ as well. But I don’t have a strong 
opinion about it.

If you think it improves the code, I can use
“,(and (target-powerpc?) (target-64bit?))"


NB: I forgot to mention that this patch is for core-updates-frozen.

-- 
Thanks,
Thiago

[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Maxime Devos]

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

Thiago Jung Bauermann via Guix-patches via schreef op ma 16-08-2021 om 16:46 [-0300]:
> LuaJIT isn’t ported to powerpc64le. ‘texlive-latex-base’ already disables
> them, so just do the same in texlive-texmf.
> 
> Fix suggested by Mathieu Othacehe <othacehe@gnu.org>.
> 
> * gnu/packages/tex.scm (texlive-texmf)[arguments]<#:phases>{texmf-config}:
> Disable LuaJIT engines when building for powerpc64le.
> ---
> 
> Hello,
> 
> This fixes the build of ‘texlive-texmf’ on powerpc64le. It was failing
> with these errors:
> 
>   fmtutil [ERROR]: not building luajittex due to missing engine: luajittex
>   fmtutil [ERROR]: not building luajithbtex due to missing engine: luajithbtex
> 
> Thank you very much to Mathieu for his help in making  this work.
> 
>  gnu/packages/tex.scm | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
> index 70166941d554..3c0b87352a10 100644
> --- a/gnu/packages/tex.scm
> +++ b/gnu/packages/tex.scm
> @@ -6821,9 +6821,17 @@ directly generate PDF documents instead of DVI.")
>                       (share (string-append out "/share"))
>                       (texmfroot (string-append share "/texmf-dist/web2c"))
>                       (texmfcnf (string-append texmfroot "/texmf.cnf"))
> +                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
>                       (texlive-bin (assoc-ref inputs "texlive-bin"))
>                       (texbin (string-append texlive-bin "/bin"))
>                       (tlpkg (string-append texlive-bin "/share/tlpkg")))
> +                ;; LuaJIT is not ported to powerpc64le* yet.

Does that mean LuaJIT _is_ ported to powerpc64be (big endian)?

> +                (if (string-prefix? "powerpc64le"
> +                                    ,(or (%current-target-system)
> +                                        (%current-system)))

If not, then this should be (string-prefix? "powerpc64" ...).
Admittedly, Guix doesn't support powerpc64be ...

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#50081] [PATCH] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Thiago Jung Bauermann via Guix-patches via]

Hello Maxime,

Thanks for your review!

Em terça-feira, 17 de agosto de 2021, às 19:51:15 -03, Maxime Devos 
escreveu:
> Thiago Jung Bauermann via Guix-patches via schreef op ma 16-08-2021 om 
16:46 [-0300]:
> > diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
> > index 70166941d554..3c0b87352a10 100644
> > --- a/gnu/packages/tex.scm
> > +++ b/gnu/packages/tex.scm
> > @@ -6821,9 +6821,17 @@ directly generate PDF documents instead of
> > DVI.")
> > 
> >                       (share (string-append out "/share"))
> >                       (texmfroot (string-append share
> >                       "/texmf-dist/web2c"))
> >                       (texmfcnf (string-append texmfroot "/texmf.cnf"))
> > 
> > +                     (fmtutilcnf (string-append texmfroot
> > "/fmtutil.cnf"))> 
> >                       (texlive-bin (assoc-ref inputs "texlive-bin"))
> >                       (texbin (string-append texlive-bin "/bin"))
> >                       (tlpkg (string-append texlive-bin
> >                       "/share/tlpkg")))
> > 
> > +                ;; LuaJIT is not ported to powerpc64le* yet.
> 
> Does that mean LuaJIT _is_ ported to powerpc64be (big endian)?

No, LuaJIT is ported only to 32-bit PowerPC.

> > +                (if (string-prefix? "powerpc64le"
> > +                                    ,(or (%current-target-system)
> > +                                        (%current-system)))
> 
> If not, then this should be (string-prefix? "powerpc64" ...).

Ok, I will send a v2 with this change.

> Admittedly, Guix doesn't support powerpc64be ...

AFAIK powerpc64be is considered legacy nowadays.

-- 
Thanks,
Thiago

[bug#50081] [PATCH core-updates-frozen v2] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64*

[Thiago Jung Bauermann via Guix-patches via]

LuaJIT isn’t ported to 64-bit PowerPC. ‘texlive-latex-base’ already
disables the engines that rely on it, so just do the same in texlive-texmf.

Fix suggested by Mathieu Othacehe <othacehe@gnu.org>.

* gnu/packages/tex.scm (texlive-texmf)[arguments]<#:phases>{texmf-config}:
Disable LuaJIT engines when building for powerpc64le.
---

Hello,

This fixes the build of ‘texlive-texmf’ on powerpc64le. It was failing
with these errors:

  fmtutil [ERROR]: not building luajittex due to missing engine: luajittex
  fmtutil [ERROR]: not building luajithbtex due to missing engine: luajithbtex

Thank you very much to Mathieu for his help in making  this work.

Changes since v1:
- Match target with “powerpc64” prefix rather than “powerpc64le”.

 gnu/packages/tex.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 70166941d554..900438ecacd9 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -6821,9 +6821,17 @@ directly generate PDF documents instead of DVI.")
                      (share (string-append out "/share"))
                      (texmfroot (string-append share "/texmf-dist/web2c"))
                      (texmfcnf (string-append texmfroot "/texmf.cnf"))
+                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
                      (texlive-bin (assoc-ref inputs "texlive-bin"))
                      (texbin (string-append texlive-bin "/bin"))
                      (tlpkg (string-append texlive-bin "/share/tlpkg")))
+                ;; LuaJIT is not ported to powerpc64* yet.
+                (if (string-prefix? "powerpc64"
+                                    ,(or (%current-target-system)
+                                        (%current-system)))
+                    (substitute* fmtutilcnf
+                      (("^(luajittex|luajithbtex|mfluajit)" m)
+                       (string-append "#! " m))))
                 ;; Register SHARE as TEXMFROOT in texmf.cnf.
                 (substitute* texmfcnf
                   (("TEXMFROOT = \\$SELFAUTOPARENT")

[bug#50081] [PATCH core-updates-frozen v2] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64*

[Efraim Flashner]

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

We now have a target-ppc64le? option which should be useful here.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#50081] [PATCH core-updates-frozen v2] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64*

[Thiago Jung Bauermann via Guix-patches via]

Em quarta-feira, 18 de agosto de 2021, às 07:39:21 -03, Efraim Flashner 
escreveu:
> We now have a target-ppc64le? option which should be useful here.

Yes, that’s a nice code improvement. But unfortunately it’s mutually 
exclusive with Maxime’s request to match against “powerpc64*”.

If people think the ‘target-ppc64le?’ alternative would be better than the 
“powerpc64*” one, I can send a v3.

-- 
Thanks,
Thiago

[bug#50081] [PATCH core-updates-frozen v2] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64*

[Efraim Flashner]

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

On Thu, Aug 19, 2021 at 01:51:56AM -0300, Thiago Jung Bauermann wrote:
> Em quarta-feira, 18 de agosto de 2021, às 07:39:21 -03, Efraim Flashner 
> escreveu:
> > We now have a target-ppc64le? option which should be useful here.
> 
> Yes, that’s a nice code improvement. But unfortunately it’s mutually 
> exclusive with Maxime’s request to match against “powerpc64*”.
> 
> If people think the ‘target-ppc64le?’ alternative would be better than the 
> “powerpc64*” one, I can send a v3.

IMO since powerpc64-linux isn't an actually supported architecture in
Guix we can ignore it for now and focus on powerpc64le. As far as
powerpc, as I'm the only one using it (I believe) you can pretty much
treat it like mips64el; try not to affect it unnecessarily but no
testing needed.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#50081] [PATCH core-updates-frozen v2] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64*

[Thiago Jung Bauermann via Guix-patches via]

Hello Efraim,

Em quinta-feira, 19 de agosto de 2021, às 03:52:26 -03, Efraim Flashner 
escreveu:
> On Thu, Aug 19, 2021 at 01:51:56AM -0300, Thiago Jung Bauermann wrote:
> > Em quarta-feira, 18 de agosto de 2021, às 07:39:21 -03, Efraim Flashner
> > escreveu:
> > > We now have a target-ppc64le? option which should be useful here.
> > 
> > Yes, that’s a nice code improvement. But unfortunately it’s mutually
> > exclusive with Maxime’s request to match against “powerpc64*”.
> > 
> > If people think the ‘target-ppc64le?’ alternative would be better than
> > the “powerpc64*” one, I can send a v3.
> 
> IMO since powerpc64-linux isn't an actually supported architecture in
> Guix we can ignore it for now and focus on powerpc64le.

I agree with you. I’ll send a v3 then.

> As far as powerpc, as I'm the only one using it (I believe) you can 
> pretty much treat it like mips64el; try not to affect it unnecessarily 
> but no testing needed.

Ok, thanks.

As an aside, I tried building a powerpc64le kernel with CONFIG_COMPAT set 
to see if it would allow running 32-bit binaries but it fails during 
linking. The 32-bit support feature apparently bit-rotted.

-- 
Thanks,
Thiago

[bug#50081] [PATCH core-updates-frozen v3] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Thiago Jung Bauermann via Guix-patches via]

LuaJIT isn’t ported to 64-bit PowerPC. ‘texlive-bin’ and
‘texlive-latex-base’ already disable the engines that rely on it, so just
do the same in texlive-texmf.

Fix suggested by Mathieu Othacehe <othacehe@gnu.org>.

Also, for consistency use ‘target-ppc64le’ in ‘texlive-bin’ as well.

* gnu/packages/tex.scm (texlive-bin)[arguments]<#:configure-flags>: Use
‘target-ppc64le’.
(texlive-texmf)[arguments]<#:phases>{texmf-config}:
Disable LuaJIT engines when building for powerpc64le.
---

Hello,

This fixes the build of ‘texlive-texmf’ on powerpc64le. It was failing
with these errors:

  fmtutil [ERROR]: not building luajittex due to missing engine: luajittex
  fmtutil [ERROR]: not building luajithbtex due to missing engine: luajithbtex

Thank you very much to Mathieu for his help in making  this work.

Changes since v2:
- Use ‘target-ppc64le?’ to match target string.
- Change ‘texlive-bin’ to also use ‘target-ppc64le?’.

Changes since v1:
- Match target with “powerpc64” prefix rather than “powerpc64le”.

 gnu/packages/tex.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 4500f1929264..9ec015482808 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -339,8 +339,7 @@ files from LOCATIONS with expected checksum HASH.  CODE is not currently in use.
          "--with-system-zlib"
          "--with-system-zziplib"
          ;; LuaJIT is not ported to powerpc64le* yet.
-         ,@(if (string-prefix? "powerpc64le" (or (%current-target-system)
-                                                 (%current-system)))
+         ,@(if (target-ppc64le?)
                '("--disable-luajittex"
                  "--disable-luajithbtex"
                  "--disable-mfluajit")
@@ -6829,9 +6828,15 @@ directly generate PDF documents instead of DVI.")
                      (share (string-append out "/share"))
                      (texmfroot (string-append share "/texmf-dist/web2c"))
                      (texmfcnf (string-append texmfroot "/texmf.cnf"))
+                     (fmtutilcnf (string-append texmfroot "/fmtutil.cnf"))
                      (texlive-bin (assoc-ref inputs "texlive-bin"))
                      (texbin (string-append texlive-bin "/bin"))
                      (tlpkg (string-append texlive-bin "/share/tlpkg")))
+                ;; LuaJIT is not ported to powerpc64* yet.
+                (if ,(target-ppc64le?)
+                    (substitute* fmtutilcnf
+                      (("^(luajittex|luajithbtex|mfluajit)" m)
+                       (string-append "#! " m))))
                 ;; Register SHARE as TEXMFROOT in texmf.cnf.
                 (substitute* texmfcnf
                   (("TEXMFROOT = \\$SELFAUTOPARENT")

bug#50081: [PATCH core-updates-frozen v3] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Efraim Flashner]

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

I took out the unrelated patch to texlive-bin and pushed the part for
texlive-texmf.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#50081] [PATCH core-updates-frozen v3] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Thiago Jung Bauermann via Guix-patches via]

Hello Efraim,

Em domingo, 22 de agosto de 2021, às 08:19:48 -03, Efraim Flashner 
escreveu:
> I took out the unrelated patch to texlive-bin

Ok. Do you think it’s worth submitting that part separately, or is it just 
unnecessary code churn?

> and pushed the part for texlive-texmf.

Thank you!

-- 
Thanks,
Thiago

[bug#50081] [PATCH core-updates-frozen v3] gnu: texlive-texmf: Disable LuaJIT engines on powerpc64le

[Efraim Flashner]

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

On Sun, Aug 22, 2021 at 07:49:45PM -0300, Thiago Jung Bauermann wrote:
> Hello Efraim,
> 
> Em domingo, 22 de agosto de 2021, às 08:19:48 -03, Efraim Flashner 
> escreveu:
> > I took out the unrelated patch to texlive-bin
> 
> Ok. Do you think it’s worth submitting that part separately, or is it just 
> unnecessary code churn?
> 
> -- 
> Thanks,
> Thiago
> 

I'd leave it and wait for it to get touched the next time. Its like
removing the trailing #t in core-updates, when we're already doing
something to the package is a good time to make the change.

-- 
Efraim Flashner   <efraim@flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]