From 3766bf622adfc86d4b364ce8a676824f4bda3299 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Thu, 15 Dec 2022 14:00:28 +0100
Subject: don't export entries from download.lst - only used by make

no need to plant that into the environment of every recipe. some Jenkins
Windows builders already run into "environment is too large for exec"
issue just by attempting a "xargs --show-limits </dev/null" from a dummy
rule within the make environment

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144217
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit ec4409a911fd4a67eb1bc74aae33081ae8510339)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144325
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 70f0cf457bdd36e914f3e98cf027ee25a75df448)

Cherry-pick part of commit d9617d5529e0da23bd8602d07ce459cc42746e02 to
fix make module.clean.

Change-Id: I321fa9075532eef62a7d4e33a08c272276de717e
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index ba42d020d5d0..ffad4a34d700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7752,7 +7752,7 @@ if test "$with_export_validation" != "no"; then
             ODFVALIDATOR="$BUILDDIR/bin/odfvalidator.sh"
 
             # and fetch name of odfvalidator jar name from download.lst
-            ODFVALIDATOR_JAR=`$SED -n -e "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
+            ODFVALIDATOR_JAR=`$SED -n -e "s/^ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
             AC_SUBST(ODFVALIDATOR_JAR)
 
             if test -z "$ODFVALIDATOR_JAR"; then
@@ -7779,7 +7779,7 @@ if test "$with_export_validation" != "no"; then
             OFFICEOTRON="$BUILDDIR/bin/officeotron.sh"
 
             # and fetch name of officeotron jar name from download.lst
-            OFFICEOTRON_JAR=`$SED -n -e "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
+            OFFICEOTRON_JAR=`$SED -n -e "s/^OFFICEOTRON_JAR *:= *\(.*\) */\1/p" $SRC_ROOT/download.lst`
             AC_SUBST(OFFICEOTRON_JAR)
 
             if test -z "$OFFICEOTRON_JAR"; then
-- 
cgit