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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 693DE1581F3 for ; Tue, 3 Dec 2024 17:03:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9FBA7E08C2; Tue, 3 Dec 2024 17:03:23 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6CF9CE08C2 for ; Tue, 3 Dec 2024 17:03:23 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32801340BE2 for ; Tue, 3 Dec 2024 17:03:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B19D13F5 for ; Tue, 3 Dec 2024 17:03:20 +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: <1733245398.cd433ef5bd667bda7bc439cfaca7e5e111768b7f.ppn@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/, dev-lua/cqueues/files/ 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/files/ dev-lua/cqueues/ X-VCS-Committer: ppn X-VCS-Committer-Name: Nicolas PARLANT X-VCS-Revision: cd433ef5bd667bda7bc439cfaca7e5e111768b7f X-VCS-Branch: dev Date: Tue, 3 Dec 2024 17:03:20 +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: 1670a477-7be8-4bf5-92d5-0ef9b50a9c51 X-Archives-Hash: 50af3415cbba059d3bb0a9c83f7918bb commit: cd433ef5bd667bda7bc439cfaca7e5e111768b7f Author: Nicolas PARLANT parhuet fr> AuthorDate: Tue Dec 3 16:58:09 2024 +0000 Commit: Nicolas PARLANT parhuet fr> CommitDate: Tue Dec 3 17:03:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd433ef5 dev-lua/cqueues: use upstream compat53 last clean of *flags Signed-off-by: Nicolas PARLANT parhuet.fr> dev-lua/cqueues/cqueues-20200726.ebuild | 65 ++++++++++++++-------- .../cqueues/files/cqueues-20200726-5-4_tests.patch | 3 - .../cqueues-20200726-rm-vendor-compat53.patch | 62 +++++++++++++++++++++ 3 files changed, 103 insertions(+), 27 deletions(-) diff --git a/dev-lua/cqueues/cqueues-20200726.ebuild b/dev-lua/cqueues/cqueues-20200726.ebuild index 4cd068753..66cdca9e1 100644 --- a/dev-lua/cqueues/cqueues-20200726.ebuild +++ b/dev-lua/cqueues/cqueues-20200726.ebuild @@ -24,20 +24,49 @@ REQUIRED_USE="${LUA_REQUIRED_USE}" DEPEND=" ${LUA_DEPS} dev-libs/openssl:0= + dev-lua/compat53[${LUA_USEDEP}] " RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" DOCS=( "doc/." ) -PATCHES="${FILESDIR}/cqueues-20200726-5-4_tests.patch" +PATCHES=( + "${FILESDIR}"/${PN}-20200726-5-4_tests.patch + "${FILESDIR}"/${PN}-20200726-rm-vendor-compat53.patch +) + +lua_src_prepare() { + pushd "${BUILD_DIR}" || die + + if [[ ${ELUA} != luajit ]]; then + LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" + # these two tests are forced upstream for luajit only + rm "${BUILD_DIR}"/regress/{44-resolvers-gc,51-join-defunct-thread}.lua || die + else + # Thanks to dev-lua/luaossl for this workaround + # This is a workaround for luajit, as it confirms to lua5.1 + # and the 'GNUmakefile' doesn't understand LuaJITs version. + LUA_VERSION="5.1" + fi + + if [[ ${LUA_VERSION} != 5.3 ]]; then + # this test is forced upstream for lua5-3 only + 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 + + popd +} src_prepare() { default - sed \ - -e '/LUAPATH :=/d' \ - -e '/LUAPATH_FN =/d' \ + -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 # tests deleted : @@ -49,6 +78,7 @@ src_prepare() { regress/30-starttls-completion.lua || die lua_copy_sources + lua_foreach_impl lua_src_prepare } lua_src_compile() { @@ -57,20 +87,13 @@ lua_src_compile() { if [[ ${ELUA} != luajit ]]; then LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" else - # Thanks to dev-lua/luaossl for this workaround - # This is a workaround for luajit, as it confirms to lua5.1 - # and the 'GNUmakefile' doesn't understand LuaJITs version. LUA_VERSION="5.1" fi - emake CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" \ - ALL_CFLAGS="${CFLAGS} -std=gnu99 -fPIC $(lua_get_CFLAGS)" \ - ALL_CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \ - ALL_SOFLAGS="${SOFLAGS} -shared" \ - ALL_LDFLAGS="${LDFLAGS}" \ - all${LUA_VERSION} + tc-env_build emake \ + $(lua_get_CFLAGS) \ + ALL_LDFLAGS="${LDFLAGS}" \ + all${LUA_VERSION} popd } @@ -84,18 +107,11 @@ lua_src_test() { if [[ ${ELUA} != luajit ]]; then LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))" - # these two tests are forced upstream for luajit only - rm "${BUILD_DIR}"/regress/{44-resolvers-gc,51-join-defunct-thread}.lua || die else LUA_VERSION="5.1" fi - if [[ ${ELUA} != lua5.3 ]]; then - # this test is forced upstream for lua5-3 only - rm "${BUILD_DIR}"/regress/152-thread-integer-passing.lua || die - fi - - default + emake CC=$(tc-getCC) check popd } @@ -113,7 +129,8 @@ lua_src_install() { LUA_VERSION="5.1" fi - emake "DESTDIR=${D}" \ + emake CC=$(tc-getCC) \ + "DESTDIR=${D}" \ "lua${LUA_VERSION/./}cpath=$(lua_get_cmod_dir)" \ "lua${LUA_VERSION/./}path=$(lua_get_lmod_dir)" \ "prefix=${EPREFIX}/usr" \ 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 92c2bb944..dd17075b8 100644 --- a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch +++ b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch @@ -1,6 +1,3 @@ -From ef7c2b2547fc3e1d26bc1d423edc2792a8056649 Mon Sep 17 00:00:00 2001 -From: Nicolas PARLANT -Date: Mon, 2 Dec 2024 09:14:19 +0000 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 new file mode 100644 index 000000000..be20242a9 --- /dev/null +++ b/dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch @@ -0,0 +1,62 @@ +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 +