• R/O
  • HTTP
  • SSH
  • HTTPS

packages: Commit

Community maintained packages for ImmortalWrt.


Commit MetaInfo

Revision347e16e3ed6eb5eaeeec7b07ce7165ebc3db5f50 (tree)
Time2022-12-05 02:46:50
AuthorJosef Schlehofer <pepe.schlehofer@gmai...>
CommiterGitHub

Log Message

Merge pull request #19997 from TDT-AG/pr/owrt-21.02-fix-libqmi-build

libqmi: fix build regressions

Change Summary

Incremental Difference

--- a/libs/libqmi/Config.in
+++ b/libs/libqmi/Config.in
@@ -13,4 +13,19 @@ config LIBQMI_WITH_QRTR_GLIB
1313 help
1414 Compile libqmi with QRTR support
1515
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+
1631 endmenu
--- a/libs/libqmi/Makefile
+++ b/libs/libqmi/Makefile
@@ -8,20 +8,23 @@
88 include $(TOPDIR)/rules.mk
99
1010 PKG_NAME:=libqmi
11-PKG_VERSION:=1.30.8
11+PKG_SOURCE_VERSION:=1.30.8
1212 PKG_RELEASE:=$(AUTORELEASE)
1313
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
1717
1818 PKG_MAINTAINER:=Nicholas Smith <nicholas@nbembedded.com>
1919
2020 PKG_INSTALL:=1
21-PKG_BUILD_PARALLEL:=1
2221
2322 include $(INCLUDE_DIR)/package.mk
2423 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
2528
2629 define Package/libqmi/config
2730 source "$(SOURCE)/Config.in"
@@ -59,27 +62,16 @@ define Package/libqmi-utils/description
5962 Utils to talk to QMI enabled modems
6063 endef
6164
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))
8375
8476 define Build/InstallDev
8577 $(INSTALL_DIR) $(1)/usr/include
@@ -99,12 +91,15 @@ define Build/InstallDev
9991 endef
10092
10193 define Package/libqmi/install
102- $(INSTALL_DIR) $(1)/usr/lib
94+ $(INSTALL_DIR) \
95+ $(1)/usr/lib \
96+ $(1)/usr/libexec
97+
10398 $(CP) \
10499 $(PKG_INSTALL_DIR)/usr/lib/libqmi*.so.* \
105100 $(1)/usr/lib/
106101
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/
108103 endef
109104
110105 define Package/qmi-utils/install
Show on old repository browser