From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA3F71581D8 for ; Wed, 4 Dec 2024 13:45:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94A3DE07E1; Wed, 4 Dec 2024 13:45:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 712A9E07E1 for ; Wed, 4 Dec 2024 13:45:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4059335D72 for ; Wed, 4 Dec 2024 13:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A4CB11DE for ; Wed, 4 Dec 2024 13:45:27 +0000 (UTC) From: "Nicolas PARLANT" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas PARLANT" Message-ID: <1733319925.0e3d7b468206d8246aa99c615d824a07a66bd6f1.ppn@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/files/, dev-lua/cqueues/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-lua/cqueues/cqueues-20200726.ebuild dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch X-VCS-Directories: dev-lua/cqueues/ dev-lua/cqueues/files/ X-VCS-Committer: ppn X-VCS-Committer-Name: Nicolas PARLANT X-VCS-Revision: 0e3d7b468206d8246aa99c615d824a07a66bd6f1 X-VCS-Branch: dev Date: Wed, 4 Dec 2024 13:45:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b9665c5-91f4-420a-8742-9b44f3425c1b X-Archives-Hash: 80af6d178eda0c67bfa8a1b258b415d4 commit: 0e3d7b468206d8246aa99c615d824a07a66bd6f1 Author: Nicolas PARLANT parhuet fr> AuthorDate: Wed Dec 4 09:26:06 2024 +0000 Commit: Nicolas PARLANT parhuet fr> CommitDate: Wed Dec 4 13:45:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e3d7b46 dev-lua/cqueues: remove call to vendor/compat53 with sed Keep compat53 for all lua_targets : (https://github.com/wahern/cqueues/pull/258#issuecomment-2516151601) minor QA Signed-off-by: Nicolas PARLANT parhuet.fr> dev-lua/cqueues/cqueues-20200726.ebuild | 20 +++++-- .../cqueues/files/cqueues-20200726-5-4_tests.patch | 1 + .../cqueues-20200726-rm-vendor-compat53.patch | 62 ---------------------- 3 files changed, 16 insertions(+), 67 deletions(-) diff --git a/dev-lua/cqueues/cqueues-20200726.ebuild b/dev-lua/cqueues/cqueues-20200726.ebuild index 66cdca9e1..99fefd8db 100644 --- a/dev-lua/cqueues/cqueues-20200726.ebuild +++ b/dev-lua/cqueues/cqueues-20200726.ebuild @@ -9,7 +9,8 @@ MY_P="${PN}-rel-${PV}" inherit lua toolchain-funcs DESCRIPTION="Stackable Continuation Queues" -HOMEPAGE="http://25thandclement.com/~william/projects/cqueues.html https://github.com/wahern/cqueues" +HOMEPAGE="https://github.com/wahern/cqueues" +HOMEPAGE+=" http://25thandclement.com/~william/projects/cqueues.html" SRC_URI="https://github.com/wahern/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" @@ -33,7 +34,6 @@ DOCS=( "doc/." ) PATCHES=( "${FILESDIR}"/${PN}-20200726-5-4_tests.patch - "${FILESDIR}"/${PN}-20200726-rm-vendor-compat53.patch ) lua_src_prepare() { @@ -55,20 +55,30 @@ lua_src_prepare() { rm "${BUILD_DIR}"/regress/152-thread-integer-passing.lua || die fi - # install test for lua_version only - sed -e 's:for V in 5.1 5.2 5.3 5.4:for V in '${LUA_VERSION}':' -i "${BUILD_DIR}"/regress/GNUmakefile || die + # install tests for lua_version only + sed -e 's:for V in 5.1 5.2 5.3 5.4:for V in '${LUA_VERSION}':' \ + -i "${BUILD_DIR}"/regress/GNUmakefile || die popd } src_prepare() { default + rm -r vendor || die sed \ -e '/HAVE_API_FN =/d' \ -e '/ALL_CFLAGS += -g/d' \ - -e 's:$(shell env CC="$(CC)" $(d)/mk/vendor.cc):'$(tc-get-compiler-type)':' \ -i GNUmakefile || die + # use header from package compat53 instead of vendor + sed -e 's:-DCOMPAT53_PREFIX=cqueues::' \ + -e 's:$$(d)/../vendor/compat53/c-api/compat-5.3.h::' \ + -e '/)\/compat53/,/)\/compat53/d' \ + -i src/GNUmakefile || die + + sed -e 's:"../vendor/compat53/c-api\/compat-5.3.h"::' \ + -i src/cqueues.h || die + # tests deleted : # 22, 73, 87 = weak/old ssl # 30 = call google.com diff --git a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch index dd17075b8..34fee2174 100644 --- a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch +++ b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch @@ -1,3 +1,4 @@ +https://github.com/wahern/cqueues/commit/ad517a210caa3cd6cc18da73015886a5a2b88b3f Subject: [PATCH] add 5.4 --- diff --git a/dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch b/dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch deleted file mode 100644 index be20242a9..000000000 --- a/dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch +++ /dev/null @@ -1,62 +0,0 @@ -Subject: [PATCH] remove vendor compat53 - ---- - src/GNUmakefile | 14 ++------------ - src/cqueues.h | 2 +- - 2 files changed, 3 insertions(+), 13 deletions(-) - -diff --git a/src/GNUmakefile b/src/GNUmakefile -index 0b15461..99aba94 100644 ---- a/src/GNUmakefile -+++ b/src/GNUmakefile -@@ -22,7 +22,7 @@ VENDOR_$(d) = $(or $(CQUEUES_VENDOR),$(shell $( - #include - --#include "../vendor/compat53/c-api/compat-5.3.h" -+#include - - - /* --- -2.45.2 -