mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

tools/zlib: switch to configure script 

A future commit will make tools/cmake use this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2022-09-25 00:22:24 -07:00 committed by Christian Marangi
parent ec8fb542ec
commit d602e7a969
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/Makefile
View File

@ -75,7 +75,6 @@ $(curdir)/quilt/compile := $(curdir)/autoconf/compile $(curdir)/findutils/compil
$(curdir)/sdcc/compile := $(curdir)/bison/compile $(curdir)/sdcc/compile := $(curdir)/bison/compile
$(curdir)/squashfs/compile := $(curdir)/lzma-old/compile $(curdir)/squashfs/compile := $(curdir)/lzma-old/compile
$(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile $(curdir)/squashfskit4/compile := $(curdir)/xz/compile $(curdir)/zlib/compile
$(curdir)/zlib/compile := $(curdir)/cmake/compile
$(curdir)/zstd/compile := $(curdir)/meson/compile $(curdir)/zstd/compile := $(curdir)/meson/compile
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
@ -92,7 +91,7 @@ else
endif endif
ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),) ifneq ($(CONFIG_CCACHE)$(CONFIG_SDK),)
$(foreach tool, $(filter-out xz zstd pkgconf patch ninja meson libressl cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile)) $(foreach tool, $(filter-out zstd zlib xz pkgconf patch ninja meson libressl cmake,$(tools-y)), $(eval $(curdir)/$(tool)/compile += $(curdir)/ccache/compile))
tools-y += ccache tools-y += ccache
$(curdir)/ccache/compile := $(curdir)/cmake/compile $(curdir)/zstd/compile $(curdir)/ccache/compile := $(curdir)/cmake/compile $(curdir)/zstd/compile
endif endif

26
tools/zlib/Makefile
View File

@ -20,23 +20,23 @@ PKG_LICENSE:=Zlib
PKG_LICENSE_FILES:=README PKG_LICENSE_FILES:=README
PKG_CPE_ID:=cpe:/a:gnu:zlib PKG_CPE_ID:=cpe:/a:gnu:zlib
HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/cmake.mk
HOST_CFLAGS +=-fPIC HOSTCC := $(HOSTCC_NOCACHE)
HOST_CFLAGS += $(HOST_FPIC)
define Host/Install HOST_CONFIGURE_ARGS = \
$(CP) $(HOST_BUILD_DIR)/libz.a $(STAGING_DIR_HOST)/lib/ --prefix=$(STAGING_DIR_HOST) \
$(CP) $(HOST_BUILD_DIR)/zconf.h $(STAGING_DIR_HOST)/include/ --sysconfdir=$(STAGING_DIR_HOST)/etc \
$(CP) $(HOST_BUILD_DIR)/zlib.h $(STAGING_DIR_HOST)/include/ --localstatedir=$(STAGING_DIR_HOST)/var \
$(CP) $(HOST_BUILD_DIR)/zlib.pc $(STAGING_DIR_HOST)/lib/pkgconfig/ --libdir=$(STAGING_DIR_HOST)/lib \
endef --includedir=$(STAGING_DIR_HOST)/include \
--static
define Host/Clean define Host/Uninstall
rm -f $(STAGING_DIR_HOST)/lib/libz.a -$(call Host/Compile/Default,uninstall)
rm -f $(STAGING_DIR_HOST)/include/zconf.h
rm -f $(STAGING_DIR_HOST)/include/zlib.h
rm -f $(STAGING_DIR_HOST)/lib/pkgconfig//zlib.pc
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))