From 0cc8690d54a29d6748f94eff071fc3ec879d230a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 14 Oct 2019 10:31:09 -0700 Subject: [PATCH 1/2] libmbim: Fix compilation with full iconv nls.mk is needed. explicitly disabled udev. It's not available for use. Added autoreconf to try to fix the buildbots. Minor cleanups. Signed-off-by: Rosen Penev --- libs/libmbim/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/libmbim/Makefile b/libs/libmbim/Makefile index 7731133e8..00982485d 100644 --- a/libs/libmbim/Makefile +++ b/libs/libmbim/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmbim PKG_VERSION:=1.20.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libmbim -PKG_HASH=2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866 +PKG_HASH:=2cf7c6c7aa9e962a589f61bff2766035b61792ef961131a21fcbbe043f91a866 PKG_MAINTAINER:=Nicholas Smith @@ -21,6 +21,7 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk CONFIGURE_ARGS += \ --disable-static \ @@ -53,6 +54,10 @@ define Package/mbim-utils LICENSE_FILES:=COPYING endef +CONFIGURE_ARGS += \ + --without-udev \ + --without-udev-base-dir + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) \ From d235c861fe5d05febaa43830cd14e86f0cb20ed0 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 14 Oct 2019 10:40:04 -0700 Subject: [PATCH 2/2] libqmi: Fix compilation with full iconv nls.mk is needed. Removed +glib2 dependency. It's already included in libmbim. Other minor cleanups. Signed-off-by: Rosen Penev --- libs/libqmi/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/libqmi/Makefile b/libs/libqmi/Makefile index 5b32cd09a..5445a9f5d 100644 --- a/libs/libqmi/Makefile +++ b/libs/libqmi/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi PKG_VERSION:=1.24.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi -PKG_HASH=aeb69f90c273467cce246176cba0967c6413f1995a976992770a597c4fe28c79 +PKG_HASH:=aeb69f90c273467cce246176cba0967c6413f1995a976992770a597c4fe28c79 PKG_MAINTAINER:=Nicholas Smith @@ -21,11 +21,12 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk define Package/libqmi SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+glib2 +libmbim + DEPENDS:=+libmbim TITLE:=Helper library to talk to QMI enabled modems URL:=https://www.freedesktop.org/wiki/Software/libqmi LICENSE:=LGPL-2.0-or-later @@ -58,7 +59,8 @@ CONFIGURE_ARGS += \ --disable-gtk-doc-pdf \ --enable-mbim-qmux \ --enable-firmware-update \ - --without-udev + --without-udev \ + --without-udev-base-dir define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include