Re: Bug#1122336: libreoffice: Smoketest fails on hppa and powerpc due to missing soffice.sh
Hi,
Am 11.12.25 um 17:35 schrieb John Paul Adrian Glaubitz:
On Thu, 2025-12-11 at 07:15 +0100, Rene Engelhard wrote:
(experimental_powerpc-dchroot)rene@perotto:~/libreoffice-26.2.0~beta1$ diff -u instdir/program/soffice.old instdir/program/soffice
--- instdir/program/soffice.old 2025-12-11 01:55:33.611241288 +0000
+++ instdir/program/soffice 2025-12-11 06:08:10.728584683 +0000
@@ -37,7 +37,7 @@
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-export JITC_PROCESSOR_TYPE=6
+#@JITC_PROCESSOR_TYPE_EXPORT@
# resolve installation directory
sd_cwd=$(pwd)
which is powerpc-specific, indeed. From configure.ac:
JITC_PROCESSOR_TYPE=""
if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then
# IBMs JDK needs this...
JITC_PROCESSOR_TYPE=6
export JITC_PROCESSOR_TYPE
fi
AC_SUBST([JITC_PROCESSOR_TYPE])
So it means hppa is something different.
Whether it sets "export JITC_PROCESSOR_TYPE=6" or not in the script shouldn't make any
difference unless I'm missing something. This just seems to be an environment variable
that is required when using a JDK provided by IBM but should be safe to ignore otherwise.
OK, was wondering whether OpenJDK choked on it. Then the fix would be to either
a)
$ cat remove-JITC_PROCESSOR_TYPE-setting.diff
diff --git a/config_host.mk.in b/config_host.mk.in
index 3452ad8fde5d..ece7d18116b5 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -390,7 +395,6 @@ export JDK=@JDK@
export JDK_FOR_BUILD=@JDK_FOR_BUILD@
export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=@JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD@
export JFREEREPORT_JAR=@JFREEREPORT_JAR@
-export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
JOM=@JOM@
export JQ=@JQ@
export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@
diff --git a/configure.ac b/configure.ac
index c1baba596656..04d0db7bd7d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9101,14 +9140,6 @@ AC_SUBST(LD_PLUGIN)
AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=YES, [HAVE_POSIX_FALLOCATE=NO])
AC_SUBST(HAVE_POSIX_FALLOCATE)
-JITC_PROCESSOR_TYPE=""
-if test "$_os" = "Linux" -a "$host_cpu" = "powerpc"; then
- # IBMs JDK needs this...
- JITC_PROCESSOR_TYPE=6
- export JITC_PROCESSOR_TYPE
-fi
-AC_SUBST([JITC_PROCESSOR_TYPE])
- git diff desktop/CustomTarget_soffice.mk
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 26e661ec39dc..91c06870725a 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -36,7 +36,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
ifneq ($(JITC_PROCESSOR_TYPE),)
- sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
+ sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ && chmod 755 $@
else
cp $< $@
endif
if test $_os = "WINNT"; then
for i in $PKGFORMAT; do
if test "$i" = msi; then
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 26e661ec39dc..0c895c77afc0 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -35,11 +35,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
| $(gb_CustomTarget_workdir)/desktop/soffice/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
-ifneq ($(JITC_PROCESSOR_TYPE),)
- sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
-else
cp $< $@
-endif
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED)
endif
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 7188f393e140..1f3c4cd1f0ec 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -37,8 +37,6 @@ export SAL_ENABLE_FILE_LOCKING
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-#@JITC_PROCESSOR_TYPE_EXPORT@
-
# resolve installation directory
sd_cwd=$(pwd)
sd_res="$0"
thus triggering the cp or
b)
git diff desktop/CustomTarget_soffice.mk
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 26e661ec39dc..91c06870725a 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -36,7 +36,7 @@ $(gb_CustomTarget_workdir)/desktop/soffice/soffice.sh : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED)
ifneq ($(JITC_PROCESSOR_TYPE),)
- sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@
+ sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ && chmod 755 $@
else
cp $< $@
endif
b) is cleaner and minimal-invasive.
Regards,
Ren
Adrian
Reply to: