ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-26 08:51:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1eda1a7946
openwrt/package/libs/zlib/Makefile

99 lines
2.5 KiB
Makefile
Raw Normal View History

cosmetic: remove trailing whitespaces Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 47197
2015-10-15 22:12:13 +00:00
#
zlib: update to 1.2.8 Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 37589
2013-07-28 23:27:34 +00:00
# Copyright (C) 2006-2013 OpenWrt.org
credit where credit is due SVN-Revision: 4091
2006-06-27 00:35:46 +00:00
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
add md5sums SVN-Revision: 405
2005-03-21 08:12:49 +00:00
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
include $(TOPDIR)/rules.mk
Uniformize package Makefile SVN-Revision: 640
2005-04-14 06:11:36 +00:00
PKG_NAME:=zlib
zlib: Update to 1.2.11 Update to 1.2.11 as suggested by upstream Also add SF as primary source and main site as fallback Note: SF doesn't carry the 1.2.11 update yet. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-15 20:46:27 +00:00
PKG_VERSION:=1.2.11
zlib: backport null dereference fix The curl developers found test case that crashed in their testing when using zlib patched against CVE-2022-37434, same patch we've backported in commit 7df6795d4c25 ("zlib: backport fix for heap-based buffer over-read (CVE-2022-37434)"). So we need to backport following patch in order to fix issue introduced in that previous CVE-2022-37434 fix. References: https://github.com/curl/curl/issues/9271 Fixes: 7df6795d4c25 ("zlib: backport fix for heap-based buffer over-read (CVE-2022-37434)") Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit f443e9de7003c00a935b9ea12f168e09e83b48cd) (cherry picked from commit 707ec48ab3db6d08bd022df1bc720aee68b3b99d)
2022-08-09 05:50:19 +00:00
PKG_RELEASE:=6
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
zlib: Update to 1.2.9 Update zlib to 1.2.9 and switch to XZ tarballs for download. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-02 20:22:13 +00:00
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
zlib: Update to 1.2.11 Update to 1.2.11 as suggested by upstream Also add SF as primary source and main site as fallback Note: SF doesn't carry the 1.2.11 update yet. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-01-15 20:46:27 +00:00
PKG_SOURCE_URL:=@SF/libpng http://www.zlib.net
PKG_HASH:=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
Add a few SPDX tags Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 43151
2014-11-02 12:20:54 +00:00
PKG_LICENSE:=Zlib
licensing: Add licensing metadata to many packages Two new variables are introduces to many packages, namely PKG_LICENSE and PKG_LICENSE_FILES - there may be more than one license applied to packages, and these are listed in the PKG_LICENSE variable and separated by spaces. All relevant license files are also added to the PKG_LICENSE_FILES variable, also space separated. The licensing metadata is put into the bin/<platform>/packages/Packages file for later parsing. A script for that is on it's way! SVN-Revision: 33861
2012-10-19 15:34:28 +00:00
PKG_LICENSE_FILES:=README
add PKG_CPE_ID ids to package and tools CPE ids helps to tracks CVE in packages. https://cpe.mitre.org/specification/ Thanks to swalker for CPE to package mapping and keep tracking CVEs. Acked-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
2017-09-28 02:55:46 +00:00
PKG_CPE_ID:=cpe:/a:gnu:zlib
licensing: Add licensing metadata to many packages Two new variables are introduces to many packages, namely PKG_LICENSE and PKG_LICENSE_FILES - there may be more than one license applied to packages, and these are listed in the PKG_LICENSE variable and separated by spaces. All relevant license files are also added to the PKG_LICENSE_FILES variable, also space separated. The licensing metadata is put into the bin/<platform>/packages/Packages file for later parsing. A script for that is on it's way! SVN-Revision: 33861
2012-10-19 15:34:28 +00:00
package/libs/zlib: Add option for O3 optimization Add option to use O3 optimization as not all devices have space constraints. This option is default using GCC in upstream but isn't in the CMake makefile for some reason. Source: https://github.com/madler/zlib/blob/master/configure#L170 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
PKG_CONFIG_DEPENDS:= CONFIG_ZLIB_OPTIMIZE_SPEED
add INCLUDE_DIR variable for $(TOPDIR)/include SVN-Revision: 4033
2006-06-21 02:32:39 +00:00
include $(INCLUDE_DIR)/package.mk
package/libs/zlib: Use toolchain build logic Use build logic provided by toolchain instead of doing it manually. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
include $(INCLUDE_DIR)/cmake.mk
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
Convert packages to new template SVN-Revision: 3752
2006-05-10 19:06:22 +00:00
define Package/zlib
standardize Makefile, remove dup description SVN-Revision: 4816
2006-09-23 13:31:54 +00:00
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Library implementing the deflate compression method
URL:=http://www.zlib.net/
Convert packages to new template SVN-Revision: 3752
2006-05-10 19:06:22 +00:00
endef
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
package/libs/zlib: new package zlib-dev The patch adds a new package zlib-dev. It contains all files needed for compiling a program using the zlib library: /usr/include/zconf.h /usr/include/zlib.h /usr/lib/libz.a /usr/lib/pkgconfig/zlib.pc Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> SVN-Revision: 48151
2016-01-07 21:08:13 +00:00
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 includes the shared library.
endef
define Package/zlib-dev/description
zlib is a lossless data-compression library.
This package includes the development support files.
endef
package/libs/zlib: Add option for O3 optimization Add option to use O3 optimization as not all devices have space constraints. This option is default using GCC in upstream but isn't in the CMake makefile for some reason. Source: https://github.com/madler/zlib/blob/master/configure#L170 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
define Package/zlib/config
source "$(SOURCE)/Config.in"
endef
package/libs/zlib: Use toolchain build logic Use build logic provided by toolchain instead of doing it manually. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
TARGET_CFLAGS += $(FPIC)
nbd's makefile/menuconfig rewrite SVN-Revision: 307
2005-03-06 03:34:52 +00:00
package/libs/zlib: Add option for O3 optimization Add option to use O3 optimization as not all devices have space constraints. This option is default using GCC in upstream but isn't in the CMake makefile for some reason. Source: https://github.com/madler/zlib/blob/master/configure#L170 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
ifeq ($(CONFIG_ZLIB_OPTIMIZE_SPEED),y)
TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
endif
zlib: only enable NEON optimizations on eligible targets Instead of inferring the availability of NEON support from the target optimization flags, use a preprocessor test to decide whether to enable ARMv8 NEON optimizations. Fixes the following build error spotted by the mediatek/32 buildbot: [ 26%] Building C object CMakeFiles/zlib.dir/contrib/arm/inflate.o In file included from .../zlib-1.2.11/contrib/arm/chunkcopy.h:10:0, from .../zlib-1.2.11/contrib/arm/inflate.c:87: .../arm_neon.h:31:2: error: #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h #error You must enable NEON instructions (e.g. -mfloat-abi=softfp -mfpu=neon) to use arm_neon.h ^ In file included from .../zlib-1.2.11/contrib/arm/inflate.c:87:0: .../zlib-1.2.11/contrib/arm/chunkcopy.h:18:9: error: unknown type name 'uint8x16_t' typedef uint8x16_t chunkcopy_chunk_t; ^ [...] CMakeFiles/zlib.dir/build.make:302: recipe for target 'CMakeFiles/zlib.dir/contrib/arm/inflate.o' failed Fixes: 3acecba520 "package/libs/zlib: Add ARM and NEON optimizations" Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2018-01-04 13:43:34 +00:00
CMAKE_OPTIONS += \
-DARMv8=$$$$(echo -e '\#ifdef __ARM_NEON__\nON\n\#else\nOFF\n\#endif' | $$(TARGET_CC) $$(TARGET_CFLAGS) -x c -E - | grep -xE 'ON|OFF')
package/libs/zlib: Add ARM and NEON optimizations This adds two optimizations for ARM: NEON optimized Adler(-)32 checksum algorithm (ARMv7 and newer NEON CPUs) ARM(v7+) specific optimization for inflate I've also connected inflate optimization to the build using the following source as template. https://github.com/mirror/chromium/commit/0397489124ce7e6aced020f8b85f5034c7d5f49b#diff-a62ad2db6c83dbc205d34bb9a8884f16 Additional info: https://codereview.chromium.org/2676493007/ https://codereview.chromium.org/2722063002/ Sources: https://github.com/madler/zlib/pull/251 (only the first commit) https://github.com/madler/zlib/pull/256 Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 18:38:07 +00:00
use InstallDev/UninstallDev. SVN-Revision: 3833
2006-05-29 01:29:46 +00:00
define Build/InstallDev
add $(STAGING_DIR) as argument to the InstallDev template and update packages accordingly - this way we can reuse InstallDev to automatically generate UninstallDev or create -dev packages SVN-Revision: 9052
2007-09-28 01:45:11 +00:00
mkdir -p $(1)/usr/include
normalize Makefiles. SVN-Revision: 3998
2006-06-18 18:30:40 +00:00
$(CP) $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
add $(STAGING_DIR) as argument to the InstallDev template and update packages accordingly - this way we can reuse InstallDev to automatically generate UninstallDev or create -dev packages SVN-Revision: 9052
2007-09-28 01:45:11 +00:00
$(1)/usr/include/
mkdir -p $(1)/usr/lib
normalize Makefiles. SVN-Revision: 3998
2006-06-18 18:30:40 +00:00
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
add $(STAGING_DIR) as argument to the InstallDev template and update packages accordingly - this way we can reuse InstallDev to automatically generate UninstallDev or create -dev packages SVN-Revision: 9052
2007-09-28 01:45:11 +00:00
$(1)/usr/lib/
package/zlib: include zlib.pc (pkconfig) Compiling zlib produces zlib.pc (pkgconfig), but it is not currently installed in staging_dir/usr/lib/pkgconfig. If it was included other packages depending on zlib could easier be compiled. Signed-off-by: Espen Jürgensen <espenjurgensen@gmail.com> SVN-Revision: 28591
2011-10-25 21:10:37 +00:00
mkdir -p $(1)/usr/lib/pkgconfig
package/libs/zlib: Use toolchain build logic Use build logic provided by toolchain instead of doing it manually. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
$(CP) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
package/zlib: include zlib.pc (pkconfig) Compiling zlib produces zlib.pc (pkgconfig), but it is not currently installed in staging_dir/usr/lib/pkgconfig. If it was included other packages depending on zlib could easier be compiled. Signed-off-by: Espen Jürgensen <espenjurgensen@gmail.com> SVN-Revision: 28591
2011-10-25 21:10:37 +00:00
$(1)/usr/lib/pkgconfig/
use InstallDev/UninstallDev. SVN-Revision: 3833
2006-05-29 01:29:46 +00:00
endef
normalize Makefiles. SVN-Revision: 3998
2006-06-18 18:30:40 +00:00
fix openssl with zlib-dynamic (closes: #1182), bump release number SVN-Revision: 8299
2007-08-01 12:32:53 +00:00
# libz.so is needed for openssl (zlib-dynamic)
normalize Makefiles. SVN-Revision: 3998
2006-06-18 18:30:40 +00:00
define Package/zlib/install
replace lots of manual install commands with INSTALL_* variables SVN-Revision: 5624
2006-11-23 00:29:07 +00:00
$(INSTALL_DIR) $(1)/usr/lib
fix openssl with zlib-dynamic (closes: #1182), bump release number SVN-Revision: 8299
2007-08-01 12:32:53 +00:00
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/
normalize Makefiles. SVN-Revision: 3998
2006-06-18 18:30:40 +00:00
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
use InstallDev/UninstallDev. SVN-Revision: 3833
2006-05-29 01:29:46 +00:00
endef
typos SVN-Revision: 3753
2006-05-10 19:16:02 +00:00
package/libs/zlib: new package zlib-dev The patch adds a new package zlib-dev. It contains all files needed for compiling a program using the zlib library: /usr/include/zconf.h /usr/include/zlib.h /usr/lib/libz.a /usr/lib/pkgconfig/zlib.pc Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> SVN-Revision: 48151
2016-01-07 21:08:13 +00:00
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_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
package/libs/zlib: Use toolchain build logic Use build logic provided by toolchain instead of doing it manually. Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2017-09-05 17:31:10 +00:00
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pkgconfig/zlib.pc \
package/libs/zlib: new package zlib-dev The patch adds a new package zlib-dev. It contains all files needed for compiling a program using the zlib library: /usr/include/zconf.h /usr/include/zlib.h /usr/lib/libz.a /usr/lib/pkgconfig/zlib.pc Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> SVN-Revision: 48151
2016-01-07 21:08:13 +00:00
$(1)/usr/lib/pkgconfig/
endef
typos SVN-Revision: 3753
2006-05-10 19:16:02 +00:00
$(eval $(call BuildPackage,zlib))
package/libs/zlib: new package zlib-dev The patch adds a new package zlib-dev. It contains all files needed for compiling a program using the zlib library: /usr/include/zconf.h /usr/include/zlib.h /usr/lib/libz.a /usr/lib/pkgconfig/zlib.pc Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> SVN-Revision: 48151
2016-01-07 21:08:13 +00:00
$(eval $(call BuildPackage,zlib-dev))
Reference in New Issue Copy Permalink