Browse Source

expat: don't build host libs

tools/expat is actually what's used by the various packages that
supposedly depend on expat/host.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 3 years ago
parent
commit
5bf74f2ad4
3 changed files with 3 additions and 8 deletions
  1. +1
    -1
      lang/perl-xml-parser/Makefile
  2. +1
    -1
      lang/python/python3/Makefile
  3. +1
    -6
      libs/expat/Makefile

+ 1
- 1
lang/perl-xml-parser/Makefile View File

@ -21,7 +21,7 @@ PKG_LICENSE:=GPL-1.0-or-later Artistic-1.0-Perl
PKG_BUILD_DIR:=$(BUILD_DIR)/perl/XML-Parser-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/perl/XML-Parser-$(PKG_VERSION)
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/XML-Parser-$(PKG_VERSION) HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/perl/XML-Parser-$(PKG_VERSION)
HOST_BUILD_DEPENDS:=perl/host expat/host
HOST_BUILD_DEPENDS:=perl/host
EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib
EXPAT_INCPATH:=$(STAGING_DIR)/usr/include EXPAT_INCPATH:=$(STAGING_DIR)/usr/include


+ 1
- 1
lang/python/python3/Makefile View File

@ -44,7 +44,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_python3-setuptools CONFIG_PACKAGE_python3-pip CONFIG_PACKAGE_python3-setuptools CONFIG_PACKAGE_python3-pip
PKG_BUILD_DEPENDS:=bluez python3/host PKG_BUILD_DEPENDS:=bluez python3/host
HOST_BUILD_DEPENDS:=bzip2/host expat/host libffi/host
HOST_BUILD_DEPENDS:=bzip2/host libffi/host
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


+ 1
- 6
libs/expat/Makefile View File

@ -20,7 +20,6 @@ PKG_CPE_ID:=cpe:/a:libexpat:expat
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk
@ -35,7 +34,7 @@ define Package/libexpat/description
A fast, non-validating, stream-oriented XML parsing library. A fast, non-validating, stream-oriented XML parsing library.
endef endef
OPTIONS += \
CMAKE_OPTIONS += \
-DDOCBOOK_TO_MAN=OFF \ -DDOCBOOK_TO_MAN=OFF \
-DEXPAT_BUILD_TOOLS=OFF \ -DEXPAT_BUILD_TOOLS=OFF \
-DEXPAT_BUILD_EXAMPLES=OFF \ -DEXPAT_BUILD_EXAMPLES=OFF \
@ -47,13 +46,9 @@ OPTIONS += \
-DEXPAT_NS=OFF \ -DEXPAT_NS=OFF \
-DEXPAT_DEV_URANDOM=OFF -DEXPAT_DEV_URANDOM=OFF
CMAKE_OPTIONS += $(OPTIONS)
CMAKE_HOST_OPTIONS += $(OPTIONS)
define Package/libexpat/install define Package/libexpat/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
endef endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,libexpat)) $(eval $(call BuildPackage,libexpat))

Loading…
Cancel
Save