From a2eb391e8f2778b54f2c3ef447d68d8a60902812 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Sun, 5 Jul 2020 11:29:00 +0200 Subject: [PATCH 1/2] fix pkgsCross.*.texinfoInteractive This fixes #86166 to build cross compilied texinfoInteractive. BUILD_CC has been renamed to CC_FOR_BUILD so the patch needs to applied this renaming. tested on: pkgsCross.armv7l-hf-multiplatform.texinfoInteractive --- pkgs/development/tools/misc/texinfo/cross-tools-flags.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch index da28a309719..f3beac7ef90 100644 --- a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch +++ b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -4,8 +4,9 @@ diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure @@ -23281,7 +23281,7 @@ # env -i gives this build host configure a clean environment; # consequently, we have to re-initialize $PATH. - env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ +- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ - PATH="$PATH" \ ++ env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ + PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ tools_only=1 \ ${confdir}/configure --build=${build} --host=${build} \ From b92c2c666c762b5b4725ad8b688724d56d921ab9 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Fri, 10 Jul 2020 08:07:35 +0200 Subject: [PATCH 2/2] Update cross-tools-flags.patch --- pkgs/development/tools/misc/texinfo/cross-tools-flags.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch index f3beac7ef90..f0a8c4dfdc1 100644 --- a/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch +++ b/pkgs/development/tools/misc/texinfo/cross-tools-flags.patch @@ -6,7 +6,7 @@ diff -ur texinfo-6.5/configure texinfo-6.5-patched/configure # consequently, we have to re-initialize $PATH. - env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \ - PATH="$PATH" \ -+ env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ ++ env -i CC="$CC_FOR_BUILD" AR="$AR_FOR_BUILD" RANLIB="$RANLIB_FOR_BUILD" \ + PATH="$PATH" CFLAGS="$NATIVE_TOOLS_CFLAGS" LDFLAGS="$NATIVE_TOOLS_LDFLAGS" \ tools_only=1 \ ${confdir}/configure --build=${build} --host=${build} \