[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



Hi,

Am 11.12.25 um 17:03 schrieb John Paul Adrian Glaubitz:
On Wed, 2025-12-10 at 08:40 +0100, John Paul Adrian Glaubitz wrote:
Thus, we need to figure out why the build doesn't actually generated the wrapper script
for hppa, powerpc (and probably m68k) in order to fix the smokeest on these targets.
So, it turns out that the wrapper script wasn't copied

But the file is there as perotto shows.

See my last reply.


because hppa, m68k and powerpc are listed in OOO_NOGUI_ARCHS which the following patch fixes:

Your "patch" adds them where you say it was listed before. $(filter is not $(filter-out here. This setting
also is supposed to control whether LO is built twice, one time with --disable-gui (*-nogui packages) and one time with GUI.

Don't think you want that on those archs.

--- debian/rules.orig   2025-12-11 15:56:17.424880233 +0000
+++ debian/rules        2025-12-10 11:19:19.696634221 +0000
@@ -775,7 +775,7 @@
  $(eval $(call gen_no_archs,OOO_REPORTBUILDER_ARCHS))
  OOO_FIREBIRD_ARCHS := $(filter-out m68k,$(OOO_BASE_ARCHS))
  $(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
-OOO_NOGUI_ARCHS := $(filter amd64 i386 arm64 armhf s390x ppc64 ppc64el,$(OOO_ARCHS))
+OOO_NOGUI_ARCHS := $(filter alpha amd64 i386 arm64 armhf s390x hppa m68k powerpc ppc64 ppc64el sparc64,$(OOO_ARCHS))
  $(eval $(call gen_no_archs,OOO_NOGUI_ARCHS))
  OOO_PDFIUM_ARCHS := $(OOO_ARCHS)
  $(eval $(call gen_no_archs,OOO_PDFIUM_ARCHS))

See above. This would result in [1]. Not what you want. and the other archs etc just running the basic tests are not there either.

While this change makes sure the script is generated, the script itself still missing the
executable flag meaning that the smoketest will still fail.

Running

	chmod 755 instdir/program/soffice

manually allows the smoketest to pass.

Which would also be solved by removing the JITC_PROCESSOR_TYPE thingy and relying on cp which would copy the +x instead

of relying on sed which dosn't create it +x.


Regards,


Rene

[1]

index ef8c2b4e0..b222415db 100644
--- a/control
+++ b/control
@@ -272,7 +272,7 @@ Standards-Version: 4.0.1
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git -b debian-experimental-26.2
 Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
 Homepage: http://www.libreoffice.org

 Package: libreoffice
@@ -381,7 +381,7 @@ Description: office productivity suite (metapackage)
   * afdko-bin: Handling of embedded fonts during import/export/...

 Package: libreoffice-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Section: metapackages
 Depends: libreoffice-base-nogui,
          libreoffice-calc-nogui,
@@ -534,7 +534,7 @@ Description: office productivity suite -- arch-dependent files
  LibreOffice.  See the libreoffice package for more information.

 Package: libreoffice-core-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Built-Using: ${cargo:Built-Using}
 Static-Built-Using: ${cargo:Static-Built-Using}
 Depends: fontconfig,
@@ -713,7 +713,7 @@ Description: office productivity suite -- word processor
  This package contains the wordprocessor component for LibreOffice.

 Package: libreoffice-writer-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: libreoffice-base-core (= ${binary:Version}),
          libreoffice-common (>= 1:7.0.0~alpha~),
          libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}),
@@ -755,7 +755,7 @@ Description: office productivity suite -- spreadsheet
  This package contains the spreadsheet component for LibreOffice.

 Package: libreoffice-calc-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: libreoffice-base-core (= ${binary:Version}),
          libreoffice-common (>= 1:7.0.0~alpha~),
          libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}),
@@ -797,7 +797,7 @@ Description: office productivity suite -- presentation
  This package contains the presentation component for LibreOffice.

 Package: libreoffice-impress-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: libreoffice-common (>= 1:7.0.0~alpha~),
          libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}),
          libreoffice-draw-nogui (= ${binary:Version}) | libreoffice-draw (= ${binary:Version}),
@@ -836,7 +836,7 @@ Description: office productivity suite -- drawing
  This package contains the drawing component for LibreOffice.

 Package: libreoffice-draw-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: libreoffice-common (>= 1:7.0.0~alpha~),
          libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}),
          libreoffice-uiconfig-draw (= ${source:Version}),
@@ -872,7 +872,7 @@ Description: office productivity suite -- equation editor
  This package contains the equation editor component for LibreOffice.

 Package: libreoffice-math-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: fonts-opensymbol (>= 2:102.11),
          libreoffice-common (>= 1:7.0.0~alpha~),
          libreoffice-core-nogui (= ${binary:Version}) | libreoffice-core (= ${binary:Version}),
@@ -926,7 +926,7 @@ Description: office productivity suite -- database
  This package contains the database component for LibreOffice.

 Package: libreoffice-base-nogui
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Section: database
 Depends: libreoffice-base-core (= ${binary:Version}),
          libreoffice-base-drivers (= ${binary:Version}),
diff --git a/tests/control b/tests/control
index 4fdfe79c8..ccd91bade 100644
--- a/tests/control
+++ b/tests/control
@@ -35,12 +35,12 @@ Restrictions: superficial
 # the installed LO. works standalone, though, so it's patched out of the
 # smoketest. Do it here separately.
 Tests: test-extension
-Architecture: amd64 arm64 i386 ppc64
+Architecture: alpha amd64 arm64 i386 m68k powerpc ppc64 sparc64
 Depends: libreoffice-core-nogui, libreoffice-common, libreoffice-java-common, libreoffice-smoketest-data, default-jdk
 Restrictions: allow-stderr, superficial, skippable

 Tests: test-extension-shared
-Architecture: amd64 arm64 i386 ppc64
+Architecture: alpha amd64 arm64 i386 m68k powerpc ppc64 sparc64
 Depends: libreoffice-core-nogui, libreoffice-common, libreoffice-java-common, libreoffice-smoketest-data, default-jdk
 Restrictions: allow-stderr, needs-root, superficial

@@ -103,12 +103,12 @@ Depends: libreoffice-dev, libreoffice-dev-doc
 Restrictions: superficial

 Tests: odk-build-examples
-Architecture: amd64 arm64 armhf i386 ppc64 ppc64el s390x
+Architecture: alpha amd64 arm64 armhf hppa i386 m68k powerpc ppc64 ppc64el s390x sparc64
 Depends: @builddeps@, libreoffice-core-nogui, libreoffice-dev, libreoffice-dev-doc, python3-uno
 Restrictions: allow-stderr, skippable

 Tests: odk-build-examples-java
-Architecture: amd64 arm64 i386 ppc64
+Architecture: alpha amd64 arm64 i386 m68k powerpc ppc64 sparc64
 Depends: @builddeps@, libreoffice-core-nogui, libreoffice-dev, libreoffice-dev-doc, libreoffice-java-common, libofficebean-java
 Restrictions: allow-stderr, skippable



Reply to: