This patch adds a host build for util-linux to make libuuid available in
the host environment.
libuuid is needed as a build dependency of gupnp, which needs a host
build for the latest version in order to do Vala API generation.
Signed-off-by: Andy Leiserson <[email protected]>
---
To me, this approach seemed preferable to making libuuid a hard prereq
for the openwrt build (i.e. include/prereq-build.mk). However, I'm happy
to submit a patch for the latter if desired.
Index: package/util-linux/Makefile
===================================================================
--- package/util-linux/Makefile (revision 36687)
+++ package/util-linux/Makefile (working copy)
@@ -22,6 +22,7 @@
PKG_BUILD_DEPENDS:=libncurses
PKG_FIXUP:=autoreconf
+include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/util-linux/Default
@@ -37,6 +38,15 @@
--disable-tls \
--without-udev
+# We only need libuuid, but using the same args as the target build to avoid
+# having a long list of --disables that needs to be maintained.
+HOST_CONFIGURE_ARGS += \
+ --enable-new-mount \
+ --with-ncurses \
+ --disable-nls \
+ --disable-tls \
+ --without-udev
+
TARGET_CFLAGS += $(FPIC)
define Build/InstallDev
@@ -63,6 +73,10 @@
$(CP) $(PKG_BUILD_DIR)/libuuid/src/.libs/libuuid.{a,so.*} $(1)/usr/lib
endef
+define Host/Install
+ $(MAKE) -C $(HOST_BUILD_DIR)/libuuid install
+endef
+
define Package/libblkid
$(call Package/util-linux/Default)
DEPENDS:=+libuuid
@@ -561,6 +575,7 @@
$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc-utils/.libs/wipefs $(1)/usr/sbin/
endef
+$(eval $(call HostBuild))
$(eval $(call BuildPackage,libblkid))
$(eval $(call BuildPackage,libmount))
$(eval $(call BuildPackage,libuuid))
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
