diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-02-18 19:51:05 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-02-18 19:58:53 +0100 |
| commit | cbe4beb442e10f9ad8fc71202e87c15a0859c44c (patch) | |
| tree | a3485aaf3adadaef528d807564e5b835dfb380c3 /include | |
| parent | 194e85e7dbc458891be2712f1055970ea9135826 (diff) | |
| download | upstream-cbe4beb442e10f9ad8fc71202e87c15a0859c44c.tar.gz upstream-cbe4beb442e10f9ad8fc71202e87c15a0859c44c.tar.bz2 upstream-cbe4beb442e10f9ad8fc71202e87c15a0859c44c.zip | |
build: fix ABI version for PROVIDES symbols
GetABISuffix does not work for intra-package ABI version of provided symbols,
since ABIV_$(provided) is not set.
Fix ABI version by using $(ABIV_$(1)) directly
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commit 0db9d118657d)
Diffstat (limited to 'include')
| -rw-r--r-- | include/package-ipkg.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index a8210f8e31..5e51b301e1 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -175,7 +175,7 @@ Package: $(1)$$(ABIV_$(1)) Version: $(VERSION) $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) -)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(call GetABISuffix,$(provide)))))) +)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1)))))) )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) )$$(call addfield,Source,$(SOURCE) )$$(call addfield,SourceName,$(1) |