domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/expat: build with autotools again

Browse Source 
Allows to set expat as a dependency to cmake and save on compilation
time.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2022-09-24 17:11:52 -07:00
committed by Christian Marangi
parent d602e7a969
commit 89df3589e6
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/Makefile
View File

@@ -22,13 +22,13 @@ ifneq ($(CONFIG_SDK)$(CONFIG_PACKAGE_kmod-b43)$(CONFIG_PACKAGE_b43legacy-firmwar
endif endif
tools-y += autoconf autoconf-archive automake bc bison cmake cpio dosfstools tools-y += autoconf autoconf-archive automake bc bison cmake cpio dosfstools
tools-y += e2fsprogs fakeroot findutils firmware-utils flex gengetopt tools-y += e2fsprogs expat fakeroot findutils firmware-utils flex gengetopt
tools-y += libressl libtool lzma m4 make-ext4fs meson missing-macros mkimage tools-y += libressl libtool lzma m4 make-ext4fs meson missing-macros mkimage
tools-y += mklibs mtd-utils mtools ninja padjffs2 patch-image tools-y += mklibs mtd-utils mtools ninja padjffs2 patch-image
tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd tools-y += patchelf pkgconf quilt squashfskit4 sstrip zip zlib zstd
tools-$(BUILD_B43_TOOLS) += b43-tools tools-$(BUILD_B43_TOOLS) += b43-tools
tools-$(BUILD_ISL) += isl tools-$(BUILD_ISL) += isl
tools-$(BUILD_TOOLCHAIN) += expat gmp mpc mpfr tools-$(BUILD_TOOLCHAIN) += gmp mpc mpfr
tools-$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini) += genext2fs tools-$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini) += genext2fs
tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs tools-$(CONFIG_TARGET_ath79) += lzma-old squashfs
tools-$(CONFIG_TARGET_mxs) += elftosb sdimage tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
@@ -47,7 +47,6 @@ $(curdir)/bison/compile := $(curdir)/flex/compile
$(curdir)/cbootimage/compile += $(curdir)/automake/compile $(curdir)/cbootimage/compile += $(curdir)/automake/compile
$(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile $(curdir)/cmake/compile += $(curdir)/libressl/compile $(curdir)/ninja/compile
$(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/dosfstools/compile := $(curdir)/autoconf/compile $(curdir)/automake/compile
$(curdir)/expat/compile := $(curdir)/cmake/compile
$(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile $(curdir)/e2fsprogs/compile := $(curdir)/libtool/compile
$(curdir)/fakeroot/compile := $(curdir)/libtool/compile $(curdir)/fakeroot/compile := $(curdir)/libtool/compile
$(curdir)/findutils/compile := $(curdir)/bison/compile $(curdir)/findutils/compile := $(curdir)/bison/compile

26
tools/expat/Makefile
View File

@@ -15,19 +15,19 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16 PKG_HASH:=a247a7f6bbb21cf2ca81ea4cbb916bfb9717ca523631675f99b3d4a5678dcd16
PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION)) PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))
include $(INCLUDE_DIR)/host-build.mk HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/cmake.mk
CMAKE_HOST_OPTIONS += \ include $(INCLUDE_DIR)/host-build.mk
-DDOCBOOK_TO_MAN=OFF \
-DEXPAT_BUILD_TOOLS=OFF \ HOSTCC := $(HOSTCC_NOCACHE)
-DEXPAT_BUILD_EXAMPLES=OFF \
-DEXPAT_BUILD_TESTS=OFF \ HOST_CONFIGURE_ARGS += \
-DEXPAT_BUILD_DOCS=OFF \ --disable-shared \
-DEXPAT_WITH_LIBBSD=OFF \ --without-docbook \
-DEXPAT_ENABLE_INSTALL=ON \ --with-pic
-DEXPAT_DTD=ON \
-DEXPAT_NS=OFF \ define Host/Uninstall
-DEXPAT_DEV_URANDOM=OFF -$(call Host/Compile/Default,uninstall)
endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))