| Revision | 347e16e3ed6eb5eaeeec7b07ce7165ebc3db5f50 (tree) |
|---|---|
| Time | 2022-12-05 02:46:50 |
| Author | Josef Schlehofer <pepe.schlehofer@gmai...> |
| Commiter | GitHub |
Merge pull request #19997 from TDT-AG/pr/owrt-21.02-fix-libqmi-build
libqmi: fix build regressions
libs/libqmi/Config.in (diff) libs/libqmi/Makefile (diff)| @@ -13,4 +13,19 @@ config LIBQMI_WITH_QRTR_GLIB | ||
| 13 | 13 | help |
| 14 | 14 | Compile libqmi with QRTR support |
| 15 | 15 | |
| 16 | +choice | |
| 17 | + prompt "Select QMI message collection to build" | |
| 18 | + default LIBQMI_COLLECTION_BASIC | |
| 19 | + | |
| 20 | + config LIBQMI_COLLECTION_MINIMAL | |
| 21 | + depends on !MODEMMANAGER_WITH_QMI | |
| 22 | + bool "minimal" | |
| 23 | + | |
| 24 | + config LIBQMI_COLLECTION_BASIC | |
| 25 | + bool "basic (default)" | |
| 26 | + | |
| 27 | + config LIBQMI_COLLECTION_FULL | |
| 28 | + bool "full" | |
| 29 | +endchoice | |
| 30 | + | |
| 16 | 31 | endmenu |
| @@ -8,20 +8,23 @@ | ||
| 8 | 8 | include $(TOPDIR)/rules.mk |
| 9 | 9 | |
| 10 | 10 | PKG_NAME:=libqmi |
| 11 | -PKG_VERSION:=1.30.8 | |
| 11 | +PKG_SOURCE_VERSION:=1.30.8 | |
| 12 | 12 | PKG_RELEASE:=$(AUTORELEASE) |
| 13 | 13 | |
| 14 | -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz | |
| 15 | -PKG_SOURCE_URL:=https://www.freedesktop.org/software/libqmi | |
| 16 | -PKG_HASH:=862482ce9e3ad0bd65d264334ee311cdb94b9df2863b5b7136309b41b8ac1990 | |
| 14 | +PKG_SOURCE_PROTO:=git | |
| 15 | +PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git | |
| 16 | +PKG_MIRROR_HASH:=a0fa33a89011bdb593f66fd0b674f2a7c31f87e43ffd7f3e9a515b00864c4a91 | |
| 17 | 17 | |
| 18 | 18 | PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com> |
| 19 | 19 | |
| 20 | 20 | PKG_INSTALL:=1 |
| 21 | -PKG_BUILD_PARALLEL:=1 | |
| 22 | 21 | |
| 23 | 22 | include $(INCLUDE_DIR)/package.mk |
| 24 | 23 | include $(INCLUDE_DIR)/nls.mk |
| 24 | +include ../../devel/meson/meson.mk | |
| 25 | + | |
| 26 | +TARGET_CFLAGS += -ffunction-sections -fdata-sections -fno-merge-all-constants -fmerge-constants | |
| 27 | +TARGET_LDFLAGS += -Wl,--gc-sections | |
| 25 | 28 | |
| 26 | 29 | define Package/libqmi/config |
| 27 | 30 | source "$(SOURCE)/Config.in" |
| @@ -59,27 +62,16 @@ define Package/libqmi-utils/description | ||
| 59 | 62 | Utils to talk to QMI enabled modems |
| 60 | 63 | endef |
| 61 | 64 | |
| 62 | -CONFIGURE_ARGS += \ | |
| 63 | - --disable-static \ | |
| 64 | - --disable-gtk-doc \ | |
| 65 | - --disable-gtk-doc-html \ | |
| 66 | - --disable-gtk-doc-pdf \ | |
| 67 | - --disable-silent-rules \ | |
| 68 | - --enable-firmware-update \ | |
| 69 | - --without-udev \ | |
| 70 | - --without-udev-base-dir | |
| 71 | - | |
| 72 | -ifeq ($(CONFIG_LIBQMI_WITH_MBIM_QMUX),y) | |
| 73 | - CONFIGURE_ARGS += --enable-mbim-qmux | |
| 74 | -else | |
| 75 | - CONFIGURE_ARGS += --disable-mbim-qmux | |
| 76 | -endif | |
| 77 | - | |
| 78 | -ifeq ($(CONFIG_LIBQMI_WITH_QRTR_GLIB),y) | |
| 79 | - CONFIGURE_ARGS += --enable-qrtr | |
| 80 | -else | |
| 81 | - CONFIGURE_ARGS += --disable-qrtr | |
| 82 | -endif | |
| 65 | +MESON_ARGS += \ | |
| 66 | + -Dudev=false \ | |
| 67 | + -Dintrospection=false \ | |
| 68 | + -Dman=false \ | |
| 69 | + -Dbash_completion=false \ | |
| 70 | + -Db_lto=true \ | |
| 71 | + -Dmbim_qmux=$(if $(CONFIG_LIBQMI_WITH_MBIM_QMUX),true,false) \ | |
| 72 | + -Dqrtr=$(if $(CONFIG_LIBQMI_WITH_QRTR_GLIB),true,false) \ | |
| 73 | + -Dcollection=$(if $(CONFIG_LIBQMI_COLLECTION_MINIMAL),minimal\ | |
| 74 | + ,$(if $(CONFIG_LIBQMI_COLLECTION_BASIC),basic,full)) | |
| 83 | 75 | |
| 84 | 76 | define Build/InstallDev |
| 85 | 77 | $(INSTALL_DIR) $(1)/usr/include |
| @@ -99,12 +91,15 @@ define Build/InstallDev | ||
| 99 | 91 | endef |
| 100 | 92 | |
| 101 | 93 | define Package/libqmi/install |
| 102 | - $(INSTALL_DIR) $(1)/usr/lib | |
| 94 | + $(INSTALL_DIR) \ | |
| 95 | + $(1)/usr/lib \ | |
| 96 | + $(1)/usr/libexec | |
| 97 | + | |
| 103 | 98 | $(CP) \ |
| 104 | 99 | $(PKG_INSTALL_DIR)/usr/lib/libqmi*.so.* \ |
| 105 | 100 | $(1)/usr/lib/ |
| 106 | 101 | |
| 107 | - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/qmi-proxy $(1)/usr/lib/ | |
| 102 | + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/qmi-proxy $(1)/usr/libexec/ | |
| 108 | 103 | endef |
| 109 | 104 | |
| 110 | 105 | define Package/qmi-utils/install |
Fork