From d981460e43d29bd3be7b72a22987c15f7c1b5893 Mon Sep 17 00:00:00 2001 From: Yelninei Date: Thu, 12 Mar 2026 15:41:47 +0000 Subject: [PATCH] gnu: texinfo-7: Actually fix cross compiling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Followup to fdbe8b80a8b3b7f045e03005b38035dff6c78f73. * gnu/packages/texinfo.scm (texinfo-7)[#:configure-flags]: Disable perl extension when cross-compiling. [#:phases]: Remove 'build-native-tools phase. Change-Id: I87a5025b2ce51aeeafc7011e877bc70aa858f6b2 Signed-off-by: Ludovic Courtès Merges: #7086 --- gnu/packages/texinfo.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 339561acca..517360cf29 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -154,6 +154,10 @@ is on expressing the content semantically, avoiding physical markup commands.") #~(cons* "--with-external-Unicode-EastAsianWidth" "--with-external-Text-Unidecode" "--with-external-libintl-perl" + #$@(if (%current-target-system) + ;; tries to build for the native perl + '("--disable-perl-xs") + '()) #$flags)) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases @@ -170,15 +174,8 @@ is on expressing the content semantically, avoiding physical markup commands.") (cute patch-shebang <> (list (dirname perl))) (find-files "." ".*[.]pl"))))) #$@(if (%current-target-system) - ;; Texinfo uses a C binary during the build process, but - ;; lacks the concept of `CC_FOR_BUILD' - ;; Hack around that by building it manually. - #~((add-after 'configure 'build-native-tools - (lambda _ - (with-directory-excursion "info" - (lambda _ - (invoke "make" "CC=gcc" "makedoc"))))) - (add-after 'configure 'fixup-texindex-building-from-git + ;; for help2man + #~((add-after 'configure 'fixup-texindex-building-from-git (lambda _ (symlink "../../texindex/texindex" "tools/texindex/texindex"))))