ngz pushed a commit to branch tex-team in repository guix. commit 43dd6cc54ba7ca244ef418743cb5162aa46f7332 Author: Nicolas Goaziou <m...@nicolasgoaziou.fr> AuthorDate: Mon May 13 09:25:02 2024 +0200
gnu: texlive-bin: Only build "web2c" package. * gnu/packages/tex.scm (texlive-bin)[arguments]<#:parallel-tests?>: Ignore, since it doesn't apply anymore. <#:configure-flags>: Remove all "--with-system-*" flags, which are implied. Besides, all referenced libraries are already removed from the source. Prevent building any package but "web2c". [native-inputs]: Remove GROFF-MINIMAL. [inputs]: Remove CONFIG, FONTCONFIG, FONTFORGE, GD, GHOSTSCRIPT, LIBPAPER, LIBPNG, LIBXAW, TCSH and ZLIB. * gnu/packages/tex.scm (texlive-afm2pl-bin): (texlive-autosp-bin): (texlive-cjkutils): (texlive-gregoriotex-bin): (texlive-m-tx-bin): (texlive-pmx-bin): (texlive-velthuis-bin): (texlive-vlna-bin): (texlive-chktex): (texlive-detex): (texlive-dtl): (texlive-dvi2tty): (texlive-dvidvi): (texlive-dviljk): (texlive-dviout-util): (texlive-dvipng): (texlive-dvipos): (texlive-dvisvgm): (texlive-ptex-bin): (texlive-lcdftypetools): (texlive-dvipdfmx-bin): (texlive-dvips-bin): (texlive-lacheck): (texlive-seetexk): (texlive-ps2eps): (texlive-ps2pk): (texlive-psutils-bin): (texlive-t1utils): (texlive-tex4ht-bin): (texlive-tpic2pdftex-bin): (texlive-ttfutils-bin): (texlive-upmendex-bin): (texlive-xpdfopen): (texlive-gsftopk-bin): (texlive-xml2pmx): (texlive-makeindex-bin): (texlive-xindy): (texlive-xdvi-bin): Adapt to configure flags changes in TEXLIVE-BIN. Change-Id: I9140d0616b690505cb08d82a24b6b3094e53e5af --- gnu/packages/tex.scm | 239 ++++++++++++--------------------------------------- 1 file changed, 54 insertions(+), 185 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 0adca1ef95..b71dce2fb2 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -715,9 +715,17 @@ and should be preferred to it whenever a package would otherwise depend on ;; as an external dependency, pplib and xpdf which aren't ;; supported as system libraries (see m4/kpse-xpdf-flags.m4). (delete-other-directories "libs" '("lua53" "luajit" "pplib" "xpdf")) - ;; Ignore all "utils": all of them are installed through their + ;; Remove all packages: they are installed through their ;; respective regular TeX Live package. - (delete-other-directories "utils" '()))))) + (delete-other-directories "utils" '()) + (delete-other-directories "texk" '("kpathsea" "tests" "web2c")) + ;; Tests require the "texmf.cnf" file to still be present in the + ;; tree. + (with-directory-excursion "texk/kpathsea" + (for-each + delete-file-recursively + (scandir "." (lambda (f) + (not (member f '("." ".." "texmf.cnf"))))))))))) (build-system gnu-build-system) (arguments (list @@ -727,7 +735,6 @@ and should be preferred to it whenever a package would otherwise depend on (srfi srfi-1) (srfi srfi-26)) #:out-of-source? #t - #:parallel-tests? #f ;bibtex8.test fails otherwise #:configure-flags #~(let ((kpathsea #$(this-package-input "texlive-libkpathsea"))) (list "--with-banner-add=/GNU Guix" @@ -735,22 +742,8 @@ and should be preferred to it whenever a package would otherwise depend on "--disable-native-texlive-build" "--disable-static" "--disable-linked-scripts" - "--with-system-cairo" - "--with-system-freetype2" - "--with-system-gd" - "--with-system-gmp" - "--with-system-graphite2" - "--with-system-harfbuzz" - "--with-system-icu" - "--with-system-libgs" - "--with-system-libpaper" - "--with-system-libpng" - "--with-system-mpfr" - "--with-system-pixman" - "--with-system-potrace" - "--with-system-teckit" - "--with-system-zlib" - "--with-system-zziplib" + "--disable-all-pkgs" + "--enable-web2c" ;; Help locating external kpathsea. For some reason ;; PKG-CONFIG is unable to find it. "--with-system-kpathsea" @@ -762,36 +755,7 @@ and should be preferred to it whenever a package would otherwise depend on '("--disable-luajittex" "--disable-luajithbtex" "--disable-mfluajit") - '()) - ;; Disable tools built in other packages. - #$@(map (lambda (p) (string-append "--disable-" p)) - '("afm2pl" - "autosp" - "axodraw2" - "chktex" - "cjkutils" - "devnag" - "dvi2tty" - "dvipng" - "dvisvgm" - "kpathsea" - "lacheck" - "lcdf-typetools" - "m-tx" - "pmx" - "ps2eps" - "psutils" - "t1utils" - "texdoctk" - "tpic2pdftex" - "ttf2pk2" - "ttfdump" - "upmendex" - "vlna" - "xdvik" - "xindy" - "xml2pmx" - "xpdfopen")))) + '()))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'locate-external-kpathsea @@ -817,29 +781,19 @@ and should be preferred to it whenever a package would otherwise depend on (string-append (getenv "PATH") ":" #$output "/bin")) (with-directory-excursion #$output (assoc-ref %standard-phases 'patch-source-shebangs))))))) - (native-inputs (list groff-minimal perl pkg-config)) + (native-inputs (list perl pkg-config texlive-libptexenc)) (inputs (list cairo - config - fontconfig - fontforge freetype - gd - ghostscript gmp graphite2 harfbuzz icu4c - libpaper - libpng - libxaw libxt mpfr pixman potrace - tcsh teckit - zlib zziplib)) (propagated-inputs (list texlive-libkpathsea texlive-scripts)) (synopsis "TeX Live, a package of the TeX typesetting system") @@ -1909,9 +1863,7 @@ the TeX Gyre bundle do not need this support.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-afm2pl" - (delete "--disable-afm2pl" #$flags))) + #~(cons* "--enable-afm2pl" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -4200,9 +4152,7 @@ computer-generated long formulae with many terms.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-autosp" - (delete "--disable-autosp" #$flags))) + #~(cons* "--enable-autosp" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -9437,9 +9387,7 @@ adjust locations and kerning of CJK punctuation marks.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-cjkutils-x" - (delete "--disable-cjkutils" #$flags))) + #~(cons* "--enable-cjkutils-x" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -15708,9 +15656,7 @@ logo.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-gregorio" - (delete "--disable-gregorio" #$flags))) + #~(cons* "--enable-gregorio" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -21068,9 +21014,7 @@ files.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-m-tx" - (delete "--disable-m-tx" #$flags))) + #~(cons* "--enable-m-tx" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -25611,9 +25555,7 @@ is recommended.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-pmx" - (delete "--disable-pmx" #$flags))) + #~(cons* "--enable-pmx" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -32452,9 +32394,7 @@ style).") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-devnag" - (delete "--disable-devnag" #$flags))) + #~(cons* "--enable-devnag" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -32626,9 +32566,7 @@ tale} from @emph{Alice in Wonderland}.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-vlna" - (delete "--disable-vlna" #$flags))) + #~(cons* "--enable-vlna" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -33812,9 +33750,7 @@ labels and advises the user to use a starred version instead.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-chktex" - (delete "--disable-ckhtex" #$flags))) + #~(cons* "--enable-chktex" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (add-after 'unpack 'locate-global-configuration-file @@ -34235,9 +34171,7 @@ within the document, or in the document's private package file.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-detex" - (delete "--disable-detex" #$flags))) + #~(cons* "--enable-detex" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34356,9 +34290,7 @@ information on creating packages and documentation.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dtl" - (delete "--disable-dtl" #$flags))) + #~(cons* "--enable-dtl" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34444,9 +34376,7 @@ homebrewed classes and package files.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvi2tty" - (delete "--disable-dvi2tty" #$flags))) + #~(cons* "--enable-dvi2tty" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34538,9 +34468,7 @@ drivers (much like DVItype).") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvidvi" - (delete "--disable-dvidvi" #$flags))) + #~(cons* "--enable-dvidvi" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34610,9 +34538,7 @@ file. It also supports XeTeX XDV format.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dviljk" - (delete "--disable-dviljk" #$flags))) + #~(cons* "--enable-dviljk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34658,9 +34584,7 @@ file. It also supports XeTeX XDV format.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dviout-util" - (delete "--disable-dviout-util" #$flags))) + #~(cons* "--enable-dviout-util" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34707,12 +34631,7 @@ transforms between a DVI file and a text file.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvipng" - "--with-system-freetype2" - "--with-system-gd" - "--with-system-libpng" - (delete "--disable-dvipng" #$flags))) + #~(cons* "--enable-dvipng" (delete "--disable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34761,9 +34680,7 @@ not read the postamble, so it can be started before TeX finishes.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvipos" - (delete "--disable-dvipos" #$flags))) + #~(cons* "--enable-dvipos" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -34833,13 +34750,7 @@ paper feed errors!") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvisvgm" - "--with-system-freetype2" - "--with-system-libgs" - "--with-system-potrace" - "--with-system-zlib" - (delete "--disable-dvisvgm" #$flags))) + #~(cons* "--enable-dvisvgm" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases ;; XXX: Ghostscript is detected, but HAVE_LIBGS is never set, so @@ -37006,11 +36917,9 @@ their specific needs.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-makejvf" + #~(cons* "--enable-makejvf" "--enable-mendexk" - (delete "--disable-makejvf" - (delete "--disable-mendexk" #$flags)))) + (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -38329,9 +38238,7 @@ TeX.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-lcdf-typetools" - (delete "--disable-lcdf-typetools" #$flags))) + #~(cons* "--enable-lcdf-typetools" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -39012,9 +38919,7 @@ TeX tree.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvipdfm-x" - (delete "--disable-dvipdfm-x" #$flags))) + #~(cons* "--enable-dvipdfm-x" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -39113,9 +39018,7 @@ does pdfTeX.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-dvipsk" - (delete "--disable-dvipsk" #$flags))) + #~(cons* "--enable-dvipsk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -39214,9 +39117,7 @@ generated code can be included in any LaTeX document.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-lacheck" - (delete "--disable-lacheck" #$flags))) + #~(cons* "--enable-lacheck" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -40098,9 +39999,7 @@ stylized format that Metapost outputs.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-seetexk" - (delete "--disable-seetexk" #$flags))) + #~(cons* "--enable-seetexk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -42648,9 +42547,7 @@ and glued together. This will lead to a physical product box.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-ps2eps" - (delete "--disable-ps2eps" #$flags))) + #~(cons* "--enable-ps2eps" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (add-after 'unpack 'configure-ghostscript-executable @@ -42711,9 +42608,7 @@ produce bounding box values for Rawppm or Rawpbm format files.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-ps2pk" - (delete "--disable-ps2pk" #$flags))) + #~(cons* "--enable-ps2pk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -42760,10 +42655,7 @@ documents generated that use Type 1 fonts.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-psutils" - "--with-system-libpaper" - (delete "--disable-psutils" #$flags))) + #~(cons* "--enable-psutils" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (add-after 'unpack 'patch-psutils-tests @@ -43717,9 +43609,7 @@ known as railroad diagrams.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-t1utils" - (delete "--disable-t1utils" #$flags))) + #~(cons* "--enable-t1utils" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -43871,9 +43761,7 @@ for use in planning a class.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-tex4htk" - (delete "--disable-tex4htk" #$flags))) + #~(cons* "--enable-tex4htk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -45943,9 +45831,7 @@ is planned.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-tpic2pdftex" - (delete "--disable-tpic2pdftex" #$flags))) + #~(cons* "--enable-tpic2pdftex" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -46076,11 +45962,9 @@ emulates the macro, using TikZ.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-ttfdump" + #~(cons* "--enable-ttfdump" "--enable-ttf2pk2" - (delete "--disable-ttfdump" - (delete "--disable-ttf2pk2" #$flags)))) + (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -46228,10 +46112,7 @@ chosen and developed with an emphasis on drawing graphs in economics.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-upmendex" - "--with-system-icu" - (delete "--disable-upmendex" #$flags))) + #~(cons* "--enable-upmendex" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -46608,9 +46489,7 @@ integer (given as a string) as a Cistercian numeral.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-xpdfopen" - (delete "--disable-xpdfopen" #$flags))) + #~(cons* "--enable-xpdfopen" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -47910,9 +47789,7 @@ definition files for Greek text font encodings for use with @code{fontenc}.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-gsftopk" - (delete "--disable-gsftopk" #$flags))) + #~(cons* "--enable-gsftopk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -48103,9 +47980,7 @@ correctly; and define two extra commands: @code{\\vfrac} and (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-xml2pmx" - (delete "--disable-xml2pmx" #$flags))) + #~(cons* "--enable-xml2pmx" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -54880,9 +54755,7 @@ always (re)defines a command. There is also @code{\\makeenvironment} and (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-makeindexk" - (delete "--disable-makeindexk" #$flags))) + #~(cons* "--enable-makeindexk" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check @@ -72399,9 +72272,7 @@ handle complex tests.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-xindy" - (delete "--disable-xindy" #$flags))) + #~(cons* "--enable-xindy" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases ;; Building documentation require to generate font metrics, but @@ -75213,9 +75084,7 @@ itself may be shipped out to the DVI file.") (arguments (substitute-keyword-arguments (package-arguments texlive-bin) ((#:configure-flags flags) - #~(cons* "--disable-all-pkgs" - "--enable-xdvik" - (delete "--disable-xdvik" #$flags))) + #~(cons* "--enable-xdvik" (delete "--enable-web2c" #$flags))) ((#:phases _) #~(modify-phases %standard-phases (replace 'check