update 2023-09-11 13:22:24

This commit is contained in:
github-actions[bot]
2023-09-11 13:22:24 +08:00
parent 1f1220b015
commit 1797ca6ea5
4 changed files with 58 additions and 29 deletions

View File

@@ -10,12 +10,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=2.8.2 PKG_VERSION:=2.8.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src
PKG_HASH:=698d6906d170946a869769964e57816ba3da3adf61ff75e89972b137f4658db0 PKG_HASH:=9ecc6ffe67a977d1ed279107bbdab790d73ae2a626bc38eee23fa1f6786a759e
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
Christian Lachner <gladiac@gmail.com> Christian Lachner <gladiac@gmail.com>

View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git
BASE_TAG=v2.8.2 BASE_TAG=v2.8.3
TMP_REPODIR=tmprepo TMP_REPODIR=tmprepo
PATCHESDIR=patches PATCHESDIR=patches

View File

@@ -1,5 +1,5 @@
# #
# Copyright (C) 2019 OpenWrt.org # Copyright (C) 2019-2020 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -8,44 +8,62 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ucl PKG_NAME:=ucl
PKG_VERSION:=1.03 PKG_VERSION:=1.03
PKG_RELEASE:=3
PKG_MAINTAINER:=Xingwang Liao <kuoruan@gmail.com>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download/$(PKG_SOURCE) PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/ucl/download
PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 PKG_HASH:=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
HOST_FIXUP:=autoreconf
HOST_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
HOSTCC :=gcc HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST)
HOST_CFLAGS +=-std=gnu89
define Host/Prepare HOST_CFLAGS += -std=gnu89
$(Host/Prepare/Default) TARGET_CFLAGS += -std=gnu89
mkdir -p $(STAGING_DIR_HOST)/include/ucl
CONFIGURE_ARGS += \
--enable-static \
--enable-shared \
--disable-asm
define Package/libucl
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Portable lossless data compression library
URL:=http://www.oberhumer.com/opensource/ucl/
endef endef
define Host/Configure define Package/libucl/description
(cd $(HOST_BUILD_DIR); \ UCL is a portable lossless data compression library written in ANSI C. UCL
CC="$(HOSTCC)" \ implements a number of compression algorithms that achieve an excellent
CFLAGS="$(HOST_CFLAGS)" \ compression ratio while allowing *very* fast decompression. Decompression
./configure --prefix=$(STAGING_DIR_HOST) \ requires no additional memory.
);
$(call Host/Configure/Default)
endef endef
define Host/Compile define Build/InstallDev
$(MAKE) -C $(HOST_BUILD_DIR) $(INSTALL_DIR) $(1)/usr/include/ucl
$(CP) $(PKG_INSTALL_DIR)/usr/include/ucl/ucl{,conf}.h $(1)/usr/include/ucl/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.{a,so*} $(1)/usr/lib/
endef endef
define Host/Install define Package/libucl/install
$(MAKE) -C $(HOST_BUILD_DIR) install $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libucl.so.* $(1)/usr/lib/
endef endef
define Host/Clean $(eval $(call HostBuild))
$(MAKE) -C $(HOST_BUILD_DIR) uninstall $(eval $(call BuildPackage,libucl))
rm -rf $(HOST_BUILD_DIR)
rm -rf $(STAGING_DIR_HOST)/include/ucl
endef
$(eval $(call HostBuild))

View File

@@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -48,7 +48,7 @@ AC_CANONICAL_TARGET
AM_MAINTAINER_MODE
if test -z "$ac_abs_top_srcdir"; then
- _AC_SRCPATHS(.)
+ _AC_SRCDIRS(.)
fi
if test -r .Conf.settings1; then
. ./.Conf.settings1