Re: Bug#1122336: libreoffice: Smoketest fails on hppa and powerpc due to missing soffice.sh

Hello,

On Thu, 2025-12-11 at 17:45 +0100, Rene Engelhard wrote:
> OK, was wondering whether OpenJDK choked on it. Then the fix would be to =
either
>=20
> a)
>=20
> $ 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=3D@JDK@
>  =C2=A0export JDK_FOR_BUILD=3D@JDK_FOR_BUILD@
>  =C2=A0export JDK_SECURITYMANAGER_DISALLOWED_FOR_BUILD=3D@JDK_SECURITYMAN=
AGER_DISALLOWED_FOR_BUILD@
>  =C2=A0export JFREEREPORT_JAR=3D@JFREEREPORT_JAR@
> -export JITC_PROCESSOR_TYPE=3D@JITC_PROCESSOR_TYPE@
>  =C2=A0JOM=3D@JOM@
>  =C2=A0export JQ=3D@JQ@
>  =C2=A0export JVM_ONE_PATH_CHECK=3D@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)
>  =C2=A0AC_CHECK_FUNCS(posix_fallocate, HAVE_POSIX_FALLOCATE=3DYES, [HAVE_=
POSIX_FALLOCATE=3DNO])
>  =C2=A0AC_SUBST(HAVE_POSIX_FALLOCATE)
>=20
> -JITC_PROCESSOR_TYPE=3D""
> -if test "$_os" =3D "Linux" -a "$host_cpu" =3D "powerpc"; then
> -=C2=A0 =C2=A0 # IBMs JDK needs this...
> -=C2=A0 =C2=A0 JITC_PROCESSOR_TYPE=3D6
> -=C2=A0 =C2=A0 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_soffi=
ce.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 :=
 \
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(call gb_Output_announce,$(subst $(WORKDIR)=
/,,$@),$(true),SED,1)
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(call gb_Trace_StartRange,$(subst $(WORKDIR=
)/,,$@),SED)
>  =C2=A0ifneq ($(JITC_PROCESSOR_TYPE),)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/expo=
rt JITC_PROCESSOR_TYPE=3D$(JITC_PROCESSOR_TYPE)/" $< > $@
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/expo=
rt JITC_PROCESSOR_TYPE=3D$(JITC_PROCESSOR_TYPE)/" $< > $@ && chmod 755 $@
>  =C2=A0else
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 cp $< $@
>  =C2=A0endif
>=20
>  =C2=A0if test $_os =3D "WINNT"; then
>  =C2=A0 =C2=A0 =C2=A0for i in $PKGFORMAT; do
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if test "$i" =3D msi; then
> diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffi=
ce.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 =
: \
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| $(gb_CustomTarget_workdir)/desktop/s=
office/.dir
>  =C2=A0 =C2=A0 =C2=A0$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$=
(true),SED,1)
>  =C2=A0 =C2=A0 =C2=A0$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),=
SED)
> -ifneq ($(JITC_PROCESSOR_TYPE),)
> -=C2=A0 =C2=A0 sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCE=
SSOR_TYPE=3D$(JITC_PROCESSOR_TYPE)/" $< > $@
> -else
>  =C2=A0 =C2=A0 =C2=A0cp $< $@
> -endif
>  =C2=A0 =C2=A0 =C2=A0$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SE=
D)
>=20
>  =C2=A0endif
> 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
>  =C2=A0# uncomment line below if you encounter problems starting soffice =
on your system
>  =C2=A0# SAL_NO_XINITTHREADS=3Dtrue; export SAL_NO_XINITTHREADS
>=20
> -#@JITC_PROCESSOR_TYPE_EXPORT@
> -
>  =C2=A0# resolve installation directory
>  =C2=A0sd_cwd=3D$(pwd)
>  =C2=A0sd_res=3D"$0"
>=20
> thus triggering the cp or

I think it should be safe to drop the complete handling for JITC_PROCESSOR_=
TYPE_EXPORT.

There is no JDK by IBM for 32-bit anymore, so all of this has become cruft.

> b)
>=20
>  =C2=A0git diff desktop/CustomTarget_soffice.mk
> diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffi=
ce.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 :=
 \
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(call gb_Output_announce,$(subst $(WORKDIR)=
/,,$@),$(true),SED,1)
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 $(call gb_Trace_StartRange,$(subst $(WORKDIR=
)/,,$@),SED)
>  =C2=A0ifneq ($(JITC_PROCESSOR_TYPE),)
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/expo=
rt JITC_PROCESSOR_TYPE=3D$(JITC_PROCESSOR_TYPE)/" $< > $@
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/expo=
rt JITC_PROCESSOR_TYPE=3D$(JITC_PROCESSOR_TYPE)/" $< > $@ && chmod 755 $@
>  =C2=A0else
>  =C2=A0 =C2=A0 =C2=A0 =C2=A0 cp $< $@
>  =C2=A0endif
>=20
>=20
> b) is cleaner and minimal-invasive.

Yes, but we can just drop all of this. I don't think that upstream is inter=
ested in keeping this.

Adrian

--=20
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913