mirror of
https://github.com/openwrt/openwrt.git
synced 2026-10-14 17:28:28 +04:00
Daniel Golle
bb6df54d9d
zlib-ng decides whether to build its POWER8 and POWER9 sources from a
probe that compiles getauxval(AT_HWCAP2) & PPC_FEATURE2_ARCH_2_07 and
nothing else, so it accepts any target whose libc has getauxval. On
mpc85xx that offers POWER8 to an e500v2 and the build fails:
adler32_power8.c:126:13: error: '__builtin_vsx_lxvw4x_v16qi' requires
the '-mvsx' option
POWER8 is ISA 2.07 and POWER9 is ISA 3.0, 64-bit server ISAs that no
32-bit PowerPC in the tree implements, so turn both off for
ARCH=powerpc. powerpc64 keeps them, where they build and zlib-ng gates
them on HWCAP2 at runtime.
Fixes: b6ab56871d ("zlib: switch to zlib-ng 2.3.3 in zlib-compatible mode")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
114 lines
3.1 KiB
Makefile
114 lines
3.1 KiB
Makefile
#
|
|
# Copyright (C) 2006-2013 OpenWrt.org
|
|
#
|
|
# This is free software, licensed under the GNU General Public License v2.
|
|
# See /LICENSE for more information.
|
|
#
|
|
|
|
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=zlib
|
|
PKG_VERSION:=2.3.3
|
|
PKG_RELEASE:=2
|
|
|
|
PKG_SOURCE_PROTO:=git
|
|
PKG_SOURCE_URL:=https://github.com/zlib-ng/zlib-ng.git
|
|
PKG_SOURCE_VERSION:=12731092979c6d07f42da27da673a9f6c7b13586
|
|
PKG_MIRROR_HASH:=c3ebdd6698f644dc4f21f7ce55180ae98bf72636f541c0edc8757126b63ce868
|
|
|
|
PKG_LICENSE:=Zlib
|
|
PKG_LICENSE_FILES:=LICENSE.md
|
|
PKG_CPE_ID:=cpe:/a:zlib-ng:zlib-ng
|
|
|
|
PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
include $(INCLUDE_DIR)/cmake.mk
|
|
|
|
define Package/zlib
|
|
SECTION:=libs
|
|
CATEGORY:=Libraries
|
|
TITLE:=Library implementing the deflate compression method
|
|
URL:=https://github.com/zlib-ng/zlib-ng
|
|
endef
|
|
|
|
define Package/zlib-dev
|
|
SECTION:=devel
|
|
CATEGORY:=Development
|
|
SUBMENU:=Libraries
|
|
DEPENDS:=zlib
|
|
TITLE:=Development files for the zlib library
|
|
endef
|
|
|
|
define Package/zlib/description
|
|
zlib is a lossless data-compression library.
|
|
This package builds zlib-ng with the zlib-compatible API and ABI.
|
|
This package includes the shared library.
|
|
endef
|
|
|
|
define Package/zlib-dev/description
|
|
zlib is a lossless data-compression library.
|
|
This package builds zlib-ng with the zlib-compatible API and ABI.
|
|
This package includes the development support files.
|
|
endef
|
|
|
|
define Package/zlib/config
|
|
source "$(SOURCE)/Config.in"
|
|
endef
|
|
|
|
TARGET_CFLAGS += $(FPIC) -DNO_QUICK_STRATEGY
|
|
|
|
ifeq ($(CONFIG_ZLIB_OPTIMIZE_SPEED),y)
|
|
TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
|
|
endif
|
|
|
|
CMAKE_OPTIONS += \
|
|
-DZLIB_COMPAT=ON \
|
|
-DBUILD_TESTING=OFF
|
|
|
|
# POWER8 and POWER9 are 64-bit server ISAs; zlib-ng enables them from a probe
|
|
# that only looks for getauxval and PPC_FEATURE2_ARCH_2_07, so it offers them
|
|
# on e500 and PPC464 as well, where the compiler has no VSX to emit.
|
|
ifeq ($(ARCH),powerpc)
|
|
CMAKE_OPTIONS += \
|
|
-DWITH_POWER8=OFF \
|
|
-DWITH_POWER9=OFF
|
|
endif
|
|
|
|
define Build/InstallDev
|
|
mkdir -p $(1)/usr/include
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/{zconf,zlib,zlib_name_mangling}.h \
|
|
$(1)/usr/include/
|
|
mkdir -p $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
|
|
$(1)/usr/lib/
|
|
mkdir -p $(1)/usr/lib/pkgconfig
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
|
|
$(1)/usr/lib/pkgconfig/
|
|
endef
|
|
|
|
# libz.so is needed for openssl (zlib-dynamic)
|
|
define Package/zlib/install
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
|
|
endef
|
|
|
|
define Package/zlib-dev/install
|
|
$(INSTALL_DIR) $(1)/usr/include
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zconf.h \
|
|
$(1)/usr/include/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zlib.h \
|
|
$(1)/usr/include/
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/zlib_name_mangling.h \
|
|
$(1)/usr/include/
|
|
$(INSTALL_DIR) $(1)/usr/lib
|
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
|
|
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
|
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/zlib.pc \
|
|
$(1)/usr/lib/pkgconfig/
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,zlib))
|
|
$(eval $(call BuildPackage,zlib-dev))
|