Browse Source

Merge pull request #12960 from aleksander0m/aleksander/mm-no-autoreconf

modemmanager: avoid requiring autoreconf to build package
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
bc0857a153
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
  1. +6
    -1
      libs/glib2/Makefile
  2. +2
    -7
      net/modemmanager/Makefile

+ 6
- 1
libs/glib2/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=glib2
PKG_VERSION:=2.65.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/glib/2.65
@ -116,6 +116,11 @@ define Build/InstallDev
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4 \
$(2)/share/aclocal/
$(INSTALL_DIR) $(1)/usr/share/glib-2.0
$(CP) \
$(PKG_INSTALL_DIR)/usr/share/glib-2.0/codegen \
$(1)/usr/share/glib-2.0/
endef
define Package/glib2/install


+ 2
- 7
net/modemmanager/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=modemmanager
PKG_VERSION:=1.14.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=ModemManager-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.freedesktop.org/software/ModemManager
@ -20,10 +20,9 @@ PKG_MAINTAINER:=Nicholas Smith <nicholas.smith@telcoantennas.com.au>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=glib2/host libxslt/host
PKG_BUILD_DEPENDS:=libxslt/host
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@ -76,10 +75,6 @@ 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


Loading…
Cancel
Save