From b5d4cb1ce0fe4cbc9466fff6251dc09bf7a67136 Mon Sep 17 00:00:00 2001 From: tranzystorekk Date: Sat, 3 Aug 2024 19:25:30 +0200 Subject: [PATCH] llhttp: update to 9.2.1 --- common/shlibs | 2 +- srcpkgs/llhttp/files/Makefile | 25 ------------------- .../patches/allow-build-type-none.patch | 17 +++++++++++++ srcpkgs/llhttp/template | 19 +++++--------- 4 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/llhttp/files/Makefile create mode 100644 srcpkgs/llhttp/patches/allow-build-type-none.patch diff --git a/common/shlibs b/common/shlibs index 5eb5ecd4472..446e4ae0499 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3679,7 +3679,7 @@ libcaf_core.so.0.18.0 zeek-4.0.0_1 libcaf_io.so.0.18.0 zeek-4.0.0_1 libcaf_openssl.so.0.18.0 zeek-4.0.0_1 libbinpac.so.0 zeek-3.2.4_2 -libllhttp.so.1 llhttp-1.0.1_1 +libllhttp.so.9.2 llhttp-9.2.1_1 libpinyin.so.15 libpinyin-2.8.1_1 libzhuyin.so.15 libzhuyin-2.8.1_1 libuhd.so.4.6.0 uhd-4.6.0.0_1 diff --git a/srcpkgs/llhttp/files/Makefile b/srcpkgs/llhttp/files/Makefile deleted file mode 100644 index 910e584e97f..00000000000 --- a/srcpkgs/llhttp/files/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# Makefile template for shared library - -CC ?= gcc -override CFLAGS += -fPIC -Wall -Wextra -O2 -DNDEBUG -Iinclude -override LDFLAGS += -shared -Wl,-soname,libllhttp.so.1 -RM = rm -f -TARGET_LIB = libllhttp.so.1.0 - -SRCS = src/api.c src/http.c src/llhttp.c -OBJS = $(SRCS:.c=.o) - -.PHONY: all -all: ${TARGET_LIB} - -$(TARGET_LIB): $(OBJS) - $(CC) $(LDFLAGS) -o $@ $^ - -$(SRCS:.c=.d):%.d:%.c - $(CC) $(CFLAGS) -MM $< >$@ - -include $(SRCS:.c=.d) - -.PHONY: clean -clean: - -${RM} ${TARGET_LIB} ${OBJS} $(SRCS:.c=.d) diff --git a/srcpkgs/llhttp/patches/allow-build-type-none.patch b/srcpkgs/llhttp/patches/allow-build-type-none.patch new file mode 100644 index 00000000000..517f213d5a7 --- /dev/null +++ b/srcpkgs/llhttp/patches/allow-build-type-none.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 87a6692..e48c81b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,9 +14,9 @@ if(NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE RELWITHDEBINFO CACHE STRING "" FORCE) + else() + string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE) +- if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes) +- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}") +- endif() ++ # if(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes) ++ # message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}") ++ # endif() + endif() + endif() + diff --git a/srcpkgs/llhttp/template b/srcpkgs/llhttp/template index b2fbc9dd793..b04e6f9606e 100644 --- a/srcpkgs/llhttp/template +++ b/srcpkgs/llhttp/template @@ -4,9 +4,9 @@ # or at least a revbump in the same pull request since they work in-sync. pkgname=llhttp -version=2.2.1 +version=9.2.1 revision=1 -build_style=gnu-makefile +build_style=cmake short_desc="Port of http_parser to llparse" maintainer="Enno Boland " license="MIT" @@ -14,18 +14,9 @@ homepage="https://llhttp.org/" # _always_ use releases. Those have the C code generated, otherwise # we'd have a dep loop nodejs<->llhttp distfiles="https://github.com/nodejs/llhttp/archive/release/v${version}.tar.gz" -checksum=3e3de5bd2bef95fa431952e5e6766eab1c64f881c9f8474fe159a00431354469 +checksum=3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e -post_extract() { - # No need to pull in gyp for such a simple Makefile... - cp ${FILESDIR}/Makefile ${wrksrc} -} - -do_install() { - vinstall libllhttp.so.1.0 755 /usr/lib - ln -s libllhttp.so.1.0 ${DESTDIR}/usr/lib/libllhttp.so.1 - ln -s libllhttp.so.1 ${DESTDIR}/usr/lib/libllhttp.so - vcopy include /usr +post_install() { vlicense LICENSE-MIT } @@ -34,6 +25,8 @@ llhttp-devel_package() { depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/pkgconfig vmove "usr/lib/*.so" } }