From: Felix Fietkau <nbd@nbd.name>
Date: Mon, 15 Feb 2021 22:59:18 +0000 (+0100)
Subject: util-linux: move libuuid BuildPackage line further up to fix ABI versioning
X-Git-Tag: v21.02.0-rc1~235
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=46b6ee7ffc457af8aad1a0f7e5936f50041141d8;p=openwrt%2Fopenwrt.git

util-linux: move libuuid BuildPackage line further up to fix ABI versioning

After the ABI version rework, packages need to be declared in the order of
their dependencies, so that dependent packages will use the right ABI version

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
index f4b870cc47..b385030e39 100644
--- a/package/utils/util-linux/Makefile
+++ b/package/utils/util-linux/Makefile
@@ -791,11 +791,13 @@ define Package/wipefs/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/wipefs $(1)/usr/sbin/
 endef
 
+# these lines need to be ordered by dependency because of ABI versioning
+$(eval $(call BuildPackage,libuuid))
 $(eval $(call BuildPackage,libblkid))
 $(eval $(call BuildPackage,libfdisk))
+
 $(eval $(call BuildPackage,libmount))
 $(eval $(call BuildPackage,libsmartcols))
-$(eval $(call BuildPackage,libuuid))
 $(eval $(call BuildPackage,agetty))
 $(eval $(call BuildPackage,blkdiscard))
 $(eval $(call BuildPackage,blkid))