[openwrt/openwrt] build: only overwrite ABI version for provided packages when base version changed

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/542eab31a60227bd429cb0207199daf83dd6850f

commit 542eab31a60227bd429cb0207199daf83dd6850f
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Feb 15 18:53:42 2021 +0100

    build: only overwrite ABI version for provided packages when base version changed
    
    Should avoid some spurious rebuilds
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 include/package-ipkg.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index eaa80ebc75..a8210f8e31 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -156,12 +156,12 @@ ifeq ($(DUMP),)
 
     $(STAGING_DIR_ROOT)/stamp/.$(1)_installed: $(PKG_BUILD_DIR)/.pkgdir/$(1).installed
 	mkdir -p $(STAGING_DIR_ROOT)/stamp
-	$(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || \
-		echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version \
-		$(foreach pkg,$(filter-out $(1),$(PROVIDES)),; \
-			cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version \
+	$(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || { \
+		echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version; \
+		$(foreach pkg,$(filter-out $(1),$(PROVIDES)), \
+			cp $(PKG_INFO_DIR)/$(1).version $(PKG_INFO_DIR)/$(pkg).version; \
 		) \
-	)
+	} )
 	$(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy)
 	touch $$@