diff options
| author | Rosen Penev <rosenp@gmail.com> | 2019-10-28 19:22:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-28 19:22:18 -0700 |
| commit | f2ddeb214a7a99dc5e87f3e7a5f5e9d959de5352 (patch) | |
| tree | 7158f804c99d45f929af9ead68a6ab2c12a9254e | |
| parent | 8bdb66e8865bb4e1cb75ce4f07b4b3c513d6fa49 (diff) | |
| parent | fa8ad6e69c41d694b1220e04ec4f45bb8e8c1edf (diff) | |
Merge pull request #10362 from micmac1/modemmanager-host-tools
modemmanager: fix compilation
| -rw-r--r-- | net/modemmanager/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/modemmanager/Makefile b/net/modemmanager/Makefile index 885d3e283..b3416e744 100644 --- a/net/modemmanager/Makefile +++ b/net/modemmanager/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager PKG_VERSION:=1.10.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager @@ -23,6 +23,10 @@ LICENSE_FILES:=COPYING PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PKG_BUILD_DEPENDS:=glib2/host libxslt/host + +PKG_FIXUP:=autoreconf + include $(INCLUDE_DIR)/package.mk define Package/modemmanager/config @@ -73,6 +77,10 @@ define Build/Prepare ( cd "$(PKG_BUILD_DIR)"; \ printf "all:\ninstall:\n" >po/Makefile.in.in; \ ) + $(SED) 's|^\(GLIB_MKENUMS\)=.*|\1=$(STAGING_DIR_HOSTPKG)/bin/glib-mkenums|' \ + $(PKG_BUILD_DIR)/configure.ac + $(SED) 's|^\(GDBUS_CODEGEN\)=.*|\1=$(STAGING_DIR_HOSTPKG)/bin/gdbus-codegen|' \ + $(PKG_BUILD_DIR)/configure.ac endef define Build/InstallDev @@ -125,8 +133,4 @@ define Package/modemmanager/install $(INSTALL_BIN) ./files/modemmanager.proto $(1)/lib/netifd/proto/modemmanager.sh endef -$(eval $(call RequireCommand,xsltproc, \ - $(PKG_NAME) requires xsltproc installed on the host-system. \ -)) - $(eval $(call BuildPackage,modemmanager)) |