Bug#948120: libreoffice: Incorrect conditional test to enable BUILD_NOGUI_PACKAGES

[John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>]

Source: libreoffice
Severity: normal
User: debian-powerpc@lists.debian.org
Usertags: ppc64

Hi!

The build on ppc64 currently fails because debian/rules tries to execute some
script code on ppc64 which is relevant for the OOO_NOGUI_ARCHS in debian/rules.

Specifically, the build fails with:

# remove lib*uilo.so in --nogui
find debian/libreoffice-*-nogui/usr/lib/libreoffice/program/lib*uilo.so -exec rm {} \;
# and (no UI, so not needed) not needed .desktop files
find debian/libreoffice-*-nogui/usr/share/applications/*.desktop -exec rm {} \;
find: ‘debian/libreoffice-*-nogui/usr/share/applications/*.desktop’: No such file or directory
make: *** [debian/rules:2699: debian/stampdir/install-arch] Error 1

I haven't verified it, but my suspicion is that the following conditional test is
incorrect as the function findstring will match "ppc64" in OOO_NOGUI_ARCHS if
it contains "ppc64el":

ifeq "$(ENABLE_GUI)" "y"
  ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NOGUI_ARCHS)))
    BUILD_NOGUI_PACKAGES=y
  endif
else

So, I suggest to use the function "filter" instead of "findstring" to fix this
conditional test.

It's probably a good idea to check other instances of "findstring" in debian/rules
and make sure it does not match on undesired substrings.

Thanks,
Adrian

--
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz@debian.org
`. `'   Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913