From 99a0caf41054c85115c4e3fd6736ed1af4669090 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 5 Jul 2022 22:25:07 +0200 Subject: [PATCH] - ushare: rework build --- package/ushare/ushare.mk | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/package/ushare/ushare.mk b/package/ushare/ushare.mk index 9d8d259c..57309eb0 100644 --- a/package/ushare/ushare.mk +++ b/package/ushare/ushare.mk @@ -11,6 +11,9 @@ USHARE_SITE = $(call github,ddugovic,uShare,v$(USHARE_VERSION)) USHARE_DEPENDENCIES = libupnp +USHARE_CONF_ENV = \ + $(TARGET_CONFIGURE_ENV) + USHARE_CONF_OPTS = \ --prefix=$(prefix) \ --sysconfdir=$(REMOVE_sysconfdir) \ @@ -20,6 +23,14 @@ USHARE_CONF_OPTS = \ --cross-compile \ --cross-prefix=$(TARGET_CROSS) +define USHARE_CONFIGURE_CMDS + $(CHDIR)/$($(PKG)_DIR); \ + $($(PKG)_CONF_ENV) ./configure $($(PKG)_CONF_OPTS) +endef + +USHARE_MAKE_ENV = \ + $(TARGET_MAKE_ENV) + USHARE_MAKE_OPTS = \ LDFLAGS="$(TARGET_LDFLAGS)" @@ -41,11 +52,4 @@ endef USHARE_TARGET_FINALIZE_HOOKS += USHARE_INSTALL_INIT_SCRIPT ushare: | $(TARGET_DIR) - $(call PREPARE) - $(CHDIR)/$($(PKG)_DIR); \ - $(TARGET_CONFIGURE_ENV) \ - ./configure $($(PKG)_CONF_OPTS); \ - $(TARGET_MAKE_ENV) \ - $(MAKE) $($(PKG)_MAKE_OPTS); \ - $(MAKE) install DESTDIR=$(TARGET_DIR) - $(call TARGET_FOLLOWUP) + $(call autotools-package)