Skip to contentSkip to conversation

package/modem-manager: fix build without xsltproc

PATCH New Fabrice Fontaine 3 participants 3 messages Nov 5, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/modem-manager: fix build without xsltproc

Commit 8efb52c1a17210dc79cfb61f56a71ffb760ccbe9 added a libxslt dependency presumably to manage
https://github.com/freedesktop/ModemManager/commit/bbd39a457ce2949dd167f9c2e01eecf6a9e14716

However, this is wrong and build will fail on:

checking for xsltproc... no
configure: error: Please install xsltproc before configuring.

xsltproc is used to generate ModemManager-names.h since, at least, version 0.7.990 and
https://github.com/freedesktop/ModemManager/commit/365b906a3e1bda05af10f92451a6b6ae60f8b879
However, this file is already available in the official tarball so drop this unneeded dependency and set ac_cv_prog_XSLTPROC_CHECK to yes

Fixes:
- http://autobuild.buildroot.org/results/edc755b874ea43d1c009ad76c28f05e18519138e

---
 package/modem-manager/Config.in        | 1 -
 package/modem-manager/modem-manager.mk | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/modem-manager/Config.in +0 -1
index 062826fd0a..c4c723776d 100644
@@ -6,7 +6,6 @@ config BR2_PACKAGE_MODEM_MANAGER
 	select BR2_PACKAGE_DBUS # runtime dependency
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGUDEV if BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_LIBXSLT
 	help
 	  ModemManager is a DBus-activated daemon which controls mobile
 	  broadband (2G/3G/4G) devices and connections.
package/modem-manager/modem-manager.mk +2 -1
index 53cd0aff9a..372e7da1e4 100644
@@ -9,9 +9,10 @@ MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
 MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
 MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
 MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB
-MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 libxslt $(TARGET_NLS_DEPENDENCIES)
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
 MODEM_MANAGER_INSTALL_STAGING = YES
 MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
+MODEM_MANAGER_CONF_ENV = ac_cv_prog_XSLTPROC_CHECK=yes
 
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
 MODEM_MANAGER_DEPENDENCIES += libqmi
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/modem-manager: fix build without xsltproc

Hey,

Quoted 7 lines

xsltproc is used to generate ModemManager-names.h since, at least, version 0.7.990 and
https://github.com/freedesktop/ModemManager/commit/365b906a3e1bda05af10f92451a6b6ae60f8b879
However, this file is already available in the official tarball so drop this unneeded dependency and set ac_cv_prog_XSLTPROC_CHECK to yes

Yes, this is true. xsltproc would only be needed when building from git, the same as autoconf-archive.

Quoted 3 lines

MODEM_MANAGER_CONF_OPTS = --disable-more-warnings
+MODEM_MANAGER_CONF_ENV = ac_cv_prog_XSLTPROC_CHECK=yes

This is extremely ugly, but I understand it's the only way forward for now. I've created an upstream Issue to fix this in ModemManager itself:
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/276

Signature · 2 lines
Aleksander
https://aleksander.es
#2 lore raw

PATCH 1/1 package/modem-manager: fix build without xsltproc

In reply to Fabrice Fontaine
Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Commit 8efb52c1a17210dc79cfb61f56a71ffb760ccbe9 added a libxslt dependency presumably to manage
https://github.com/freedesktop/ModemManager/commit/bbd39a457ce2949dd167f9c2e01eecf6a9e14716

However, this is wrong and build will fail on:

checking for xsltproc... no
configure: error: Please install xsltproc before configuring.

xsltproc is used to generate ModemManager-names.h since, at least, version 0.7.990 and
https://github.com/freedesktop/ModemManager/commit/365b906a3e1bda05af10f92451a6b6ae60f8b879
However, this file is already available in the official tarball so drop this unneeded dependency and set ac_cv_prog_XSLTPROC_CHECK to yes

Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/edc755b874ea43d1c009ad76c28f05e18519138e

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard