public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/files/, dev-lua/cqueues/
@ 2024-12-02 10:09 Nicolas PARLANT
  0 siblings, 0 replies; 3+ messages in thread
From: Nicolas PARLANT @ 2024-12-02 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     27fedebe2364719287d421a0d961980e6766879b
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Mon Dec  2 10:06:56 2024 +0000
Commit:     Nicolas PARLANT <ppn <AT> parhuet <DOT> fr>
CommitDate: Mon Dec  2 10:09:37 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=27fedebe

dev-lua/cqueues: add tests

patch for 5.4

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>

 dev-lua/cqueues/cqueues-20200726.ebuild            | 41 +++++++++++--
 .../cqueues/files/cqueues-20200726-5-4_tests.patch | 68 ++++++++++++++++++++++
 2 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/dev-lua/cqueues/cqueues-20200726.ebuild b/dev-lua/cqueues/cqueues-20200726.ebuild
index 5bce52a20..d6caa4f84 100644
--- a/dev-lua/cqueues/cqueues-20200726.ebuild
+++ b/dev-lua/cqueues/cqueues-20200726.ebuild
@@ -21,9 +21,6 @@ IUSE="examples"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
-# tests with starttls are buggy
-RESTRICT="test"
-
 DEPEND="
 	${LUA_DEPS}
 	dev-libs/openssl:0=
@@ -33,7 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 DOCS=( "doc/." )
 
-# Thanks to dev-lua/luaossl for workarounds
+PATCHES="${FILESDIR}/cqueues-20200726-5-4_tests.patch"
 
 src_prepare() {
 	default
@@ -43,6 +40,14 @@ src_prepare() {
 		-e '/LUAPATH_FN =/d' \
 		-i GNUmakefile || die
 
+	# tests deleted :
+	# 22, 73, 87 = weak/old ssl
+	# 30 = call google.com
+	rm	regress/22-client-dtls.lua \
+		regress/73-starttls-buffering.lua \
+		regress/87-alpn-disappears.lua \
+		regress/30-starttls-completion.lua || die
+
 	lua_copy_sources
 }
 
@@ -52,6 +57,7 @@ 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"
@@ -71,14 +77,37 @@ src_compile() {
 	lua_foreach_impl lua_src_compile
 }
 
+lua_src_test() {
+	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
+		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
+
+	popd
+}
+
+src_test() {
+	lua_foreach_impl lua_src_test
+}
+
 lua_src_install() {
 	pushd "${BUILD_DIR}" || die
 
 	if [[ ${ELUA} != luajit ]]; then
 		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
 	else
-		# 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
 

diff --git a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
new file mode 100644
index 000000000..92c2bb944
--- /dev/null
+++ b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
@@ -0,0 +1,68 @@
+From ef7c2b2547fc3e1d26bc1d423edc2792a8056649 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Mon, 2 Dec 2024 09:14:19 +0000
+Subject: [PATCH] add 5.4
+
+---
+ regress/GNUmakefile |  2 +-
+ regress/regress.sh  | 10 ++++++++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/regress/GNUmakefile b/regress/GNUmakefile
+index 70c8dfe..fb9cd5a 100644
+--- a/regress/GNUmakefile
++++ b/regress/GNUmakefile
+@@ -12,7 +12,7 @@ include $(d)/../GNUmakefile
+ .PHONY: $(d)/check check
+ 
+ $(d)/check:
+-	@for V in 5.1 5.2 5.3; do \
++	@for V in 5.1 5.2 5.3 5.4; do \
+ 		printf "Building $${V}... "; \
+ 		if (cd $(@D) && ./regress.sh -r"$${V}" build >/dev/null 2>&1); then \
+ 			printf "OK\n"; \
+diff --git a/regress/regress.sh b/regress/regress.sh
+index ae55657..862f1c9 100755
+--- a/regress/regress.sh
++++ b/regress/regress.sh
+@@ -70,6 +70,8 @@ lua52path="${CQUEUES_SRCDIR}/regress/.local/share/5.2"
+ lua52cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.2"
+ lua53path="${CQUEUES_SRCDIR}/regress/.local/share/5.3"
+ lua53cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.3"
++lua54path="${CQUEUES_SRCDIR}/regress/.local/share/5.4"
++lua54cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.4"
+ 
+ export LUA_PATH="${lua51path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH:-;}"
+ export LUA_CPATH="${lua51cpath}/?.so;${LUA_CPATH:-;}"
+@@ -77,6 +79,8 @@ export LUA_PATH_5_2="${lua52path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PA
+ export LUA_CPATH_5_2="${lua52cpath}/?.so;${LUA_CPATH_5_2:-;}"
+ export LUA_PATH_5_3="${lua53path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_3:-;}"
+ export LUA_CPATH_5_3="${lua53cpath}/?.so;${LUA_CPATH_5_3:-;}"
++export LUA_PATH_5_4="${lua54path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_4:-;}"
++export LUA_CPATH_5_4="${lua54cpath}/?.so;${LUA_CPATH_5_4:-;}"
+ 
+ 
+ if [ "${0##*/}" = "regress.sh" ]; then
+@@ -87,7 +91,8 @@ if [ "${0##*/}" = "regress.sh" ]; then
+ 		(cd "${CQUEUES_SRCDIR}" && make -s "install${LUA_API}" \
+ 			lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
+ 			lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
+-			lua53path="${lua53path}" lua53cpath="${lua53cpath}")
++			lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
++			lua54path="${lua54path}" lua54cpath="${lua54cpath}")
+ 		exit $?
+ 		;;
+ 	*)
+@@ -102,7 +107,8 @@ else
+ 		(cd "${CQUEUES_SRCDIR}" && make -s install \
+ 			lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
+ 			lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
+-			lua53path="${lua53path}" lua53cpath="${lua53cpath}")
++			lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
++			lua54path="${lua54path}" lua54cpath="${lua54cpath}")
+ 	fi
+ 
+ 	if [ ! -d "${CQUEUES_SRCDIR}/regress/.local/lib/5.3" ] || ! runlua -e 'require"_cqueues"' >>/dev/null 2>&1; then
+-- 
+2.45.2
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/files/, dev-lua/cqueues/
@ 2024-12-04 13:45 Nicolas PARLANT
  0 siblings, 0 replies; 3+ messages in thread
From: Nicolas PARLANT @ 2024-12-04 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0e3d7b468206d8246aa99c615d824a07a66bd6f1
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Wed Dec  4 09:26:06 2024 +0000
Commit:     Nicolas PARLANT <ppn <AT> parhuet <DOT> 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 <nicolas.parlant <AT> 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":<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 $(<D)/../mk/changelog author))
- VERSION_$(d) = $(or $(CQUEUES_VERSION),$(shell $(<D)/../mk/changelog version))
- COMMIT_$(d) = $(shell $(<D)/../mk/changelog commit)
- 
--CPPFLAGS_$(d) = $(ALL_CPPFLAGS) -DCOMPAT53_PREFIX=cqueues
-+CPPFLAGS_$(d) = $(ALL_CPPFLAGS)
- CFLAGS_$(d) = $(ALL_CFLAGS)
- SOFLAGS_$(d) = $(ALL_SOFLAGS)
- LDFLAGS_$(d) = $(ALL_LDFLAGS)
-@@ -50,7 +50,7 @@ define BUILD_$(d)
- $$(d)/$(1)/cqueues.so: $$(addprefix $$(d)/$(1)/, $$(OBJS_$(d))) $$(d)/lib/libnonlua.a
- 	$$(CC) -o $$@ $$^ $$(SOFLAGS_$$(abspath $$(@D)/..)) $$(LDFLAGS_$$(abspath $$(@D)/..)) $$(LIBS_$$(abspath $$(@D)/..))
- 
--$$(d)/$(1)/%.o: $$(d)/%.c $$(d)/cqueues.h $$(d)/../vendor/compat53/c-api/compat-5.3.h $$(d)/config.h
-+$$(d)/$(1)/%.o: $$(d)/%.c $$(d)/cqueues.h $$(d)/config.h
- 	$$(MKDIR) -p $$(@D)
- 	$$(CC) $$(CFLAGS_$$(<D)) $$(ALL_LUA$(subst .,,$(1))_CPPFLAGS) $$(CPPFLAGS_$$(<D)) -c -o $$@ $$<
- 
-@@ -66,16 +66,6 @@ $$(d)/$(1)/thread.o: $$(d)/lib/llrb.h
- 
- $$(d)/$(1)/notify.o: $$(d)/lib/notify.h
- 
--ifneq ($(1), 5.3)
--ifneq ($(1), 5.4)
--$$(d)/$(1)/compat53.o: $$(d)/../vendor/compat53/c-api/compat-5.3.c $$(d)/../vendor/compat53/c-api/compat-5.3.h $$(d)/config.h
--	$$(MKDIR) -p $$(@D)
--	$$(CC) $$(CFLAGS_$(d)) $$(ALL_LUA$(subst .,,$(1))_CPPFLAGS) $$(CPPFLAGS_$(d)) -c -o $$@ $$<
--
--$$(d)/$(1)/cqueues.so: $$(d)/$(1)/compat53.o
--endif
--endif
--
- .SECONDARY: liblua$(1)-cqueues cqueues$(1) cqueues
- 
- liblua$(1)-cqueues cqueues$(1) cqueues: $$(d)/$(1)/cqueues.so
-diff --git a/src/cqueues.h b/src/cqueues.h
-index ef803ea..bc07024 100644
---- a/src/cqueues.h
-+++ b/src/cqueues.h
-@@ -40,7 +40,7 @@
- #include <lualib.h>
- #include <lauxlib.h>
- 
--#include "../vendor/compat53/c-api/compat-5.3.h"
-+#include <compat-5.3.h>
- 
- 
- /*
--- 
-2.45.2
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/files/, dev-lua/cqueues/
@ 2024-12-06 20:45 Nicolas PARLANT
  0 siblings, 0 replies; 3+ messages in thread
From: Nicolas PARLANT @ 2024-12-06 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4db56dbbd1283603981405b8e4b8be5414bd41ec
Author:     Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Dec  6 00:49:34 2024 +0000
Commit:     Nicolas PARLANT <ppn <AT> parhuet <DOT> fr>
CommitDate: Fri Dec  6 20:45:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4db56dbb

dev-lua/cqueues: drop 20200726

Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>

 dev-lua/cqueues/Manifest                           |   1 -
 dev-lua/cqueues/cqueues-20200726.ebuild            | 159 ---------------------
 .../cqueues/files/cqueues-20200726-5-4_tests.patch |  66 ---------
 3 files changed, 226 deletions(-)

diff --git a/dev-lua/cqueues/Manifest b/dev-lua/cqueues/Manifest
index 913c6afde..9a955e64f 100644
--- a/dev-lua/cqueues/Manifest
+++ b/dev-lua/cqueues/Manifest
@@ -1,2 +1 @@
 DIST cqueues-20200726_p20241204.tar.gz 511991 BLAKE2B 13aeb72435fbfd84e3af11f7d79547ca72b2863ffff4d24d1e14115225973f175b19440732c1d9f4f57c22ef454b3abfe503e7b18de145b4c04f44e87297365c SHA512 9e510c3da50ce601d7fde8cf4e3f4262aa9ec1e81099e4411cf233a138338f5098de8eddce5600732ff7ad97329a7eb501f7c51b911b0c3dd82cd4f0220e4c99
-DIST cqueues-rel-20200726.tar.gz 511659 BLAKE2B 2e8da34d4818e96d6872d0e544ff39465f4b55527146dd0003a80a4f11be34601fc34a123a8bd7535f3437afb4825ab9995d63141991c0b4c520c365decbaf37 SHA512 f2198a2a887bca445fe480949e05ecc94c3112827dbd65d2de0258316beee12f6052fa2670560daab708421e669dde0ac581b365af6bb94a3fc6f322c8bc7547

diff --git a/dev-lua/cqueues/cqueues-20200726.ebuild b/dev-lua/cqueues/cqueues-20200726.ebuild
deleted file mode 100644
index 09c44178b..000000000
--- a/dev-lua/cqueues/cqueues-20200726.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-rel-${PV}"
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="Stackable Continuation Queues"
-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}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-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}"/${PN}-20200726-5-4_tests.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 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' \
-		-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":<compat-5.3.h>:' \
-		-i src/cqueues.h || die
-
-	# tests deleted :
-	# 22, 73, 87 = weak/old ssl
-	# 30,62,153 = network required
-	rm	regress/22-client-dtls.lua \
-		regress/73-starttls-buffering.lua \
-		regress/87-alpn-disappears.lua \
-		regress/30-starttls-completion.lua \
-		regress/62-noname.lua \
-		regress/153-dns-resolvers.lua || die
-
-	lua_copy_sources
-	lua_foreach_impl lua_src_prepare
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	if [[ ${ELUA} != luajit ]]; then
-		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
-	else
-		LUA_VERSION="5.1"
-	fi
-
-	tc-env_build emake \
-				$(lua_get_CFLAGS) \
-				ALL_LDFLAGS="${LDFLAGS}" \
-				all${LUA_VERSION}
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}" || die
-
-	if [[ ${ELUA} != luajit ]]; then
-		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
-	else
-		LUA_VERSION="5.1"
-	fi
-
-	emake CC=$(tc-getCC) check
-
-	popd
-}
-
-src_test() {
-	lua_foreach_impl lua_src_test
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	if [[ ${ELUA} != luajit ]]; then
-		LUA_VERSION="$(ver_cut 1-2 $(lua_get_version))"
-	else
-		LUA_VERSION="5.1"
-	fi
-
-	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" \
-		install${LUA_VERSION}
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	use examples && dodoc -r "examples/."
-	einstalldocs
-}

diff --git a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch b/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
deleted file mode 100644
index 34fee2174..000000000
--- a/dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://github.com/wahern/cqueues/commit/ad517a210caa3cd6cc18da73015886a5a2b88b3f
-Subject: [PATCH] add 5.4
-
----
- regress/GNUmakefile |  2 +-
- regress/regress.sh  | 10 ++++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/regress/GNUmakefile b/regress/GNUmakefile
-index 70c8dfe..fb9cd5a 100644
---- a/regress/GNUmakefile
-+++ b/regress/GNUmakefile
-@@ -12,7 +12,7 @@ include $(d)/../GNUmakefile
- .PHONY: $(d)/check check
- 
- $(d)/check:
--	@for V in 5.1 5.2 5.3; do \
-+	@for V in 5.1 5.2 5.3 5.4; do \
- 		printf "Building $${V}... "; \
- 		if (cd $(@D) && ./regress.sh -r"$${V}" build >/dev/null 2>&1); then \
- 			printf "OK\n"; \
-diff --git a/regress/regress.sh b/regress/regress.sh
-index ae55657..862f1c9 100755
---- a/regress/regress.sh
-+++ b/regress/regress.sh
-@@ -70,6 +70,8 @@ lua52path="${CQUEUES_SRCDIR}/regress/.local/share/5.2"
- lua52cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.2"
- lua53path="${CQUEUES_SRCDIR}/regress/.local/share/5.3"
- lua53cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.3"
-+lua54path="${CQUEUES_SRCDIR}/regress/.local/share/5.4"
-+lua54cpath="${CQUEUES_SRCDIR}/regress/.local/lib/5.4"
- 
- export LUA_PATH="${lua51path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH:-;}"
- export LUA_CPATH="${lua51cpath}/?.so;${LUA_CPATH:-;}"
-@@ -77,6 +79,8 @@ export LUA_PATH_5_2="${lua52path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PA
- export LUA_CPATH_5_2="${lua52cpath}/?.so;${LUA_CPATH_5_2:-;}"
- export LUA_PATH_5_3="${lua53path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_3:-;}"
- export LUA_CPATH_5_3="${lua53cpath}/?.so;${LUA_CPATH_5_3:-;}"
-+export LUA_PATH_5_4="${lua54path}/?.lua;${CQUEUES_SRCDIR}/regress/?.lua;${LUA_PATH_5_4:-;}"
-+export LUA_CPATH_5_4="${lua54cpath}/?.so;${LUA_CPATH_5_4:-;}"
- 
- 
- if [ "${0##*/}" = "regress.sh" ]; then
-@@ -87,7 +91,8 @@ if [ "${0##*/}" = "regress.sh" ]; then
- 		(cd "${CQUEUES_SRCDIR}" && make -s "install${LUA_API}" \
- 			lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
- 			lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
--			lua53path="${lua53path}" lua53cpath="${lua53cpath}")
-+			lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
-+			lua54path="${lua54path}" lua54cpath="${lua54cpath}")
- 		exit $?
- 		;;
- 	*)
-@@ -102,7 +107,8 @@ else
- 		(cd "${CQUEUES_SRCDIR}" && make -s install \
- 			lua51path="${lua51path}" lua51cpath="${lua51cpath}" \
- 			lua52path="${lua52path}" lua52cpath="${lua52cpath}" \
--			lua53path="${lua53path}" lua53cpath="${lua53cpath}")
-+			lua53path="${lua53path}" lua53cpath="${lua53cpath}" \
-+			lua54path="${lua54path}" lua54cpath="${lua54cpath}")
- 	fi
- 
- 	if [ ! -d "${CQUEUES_SRCDIR}/regress/.local/lib/5.3" ] || ! runlua -e 'require"_cqueues"' >>/dev/null 2>&1; then
--- 
-2.45.2
-


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-06 20:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-04 13:45 [gentoo-commits] repo/proj/guru:dev commit in: dev-lua/cqueues/files/, dev-lua/cqueues/ Nicolas PARLANT
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06 20:45 Nicolas PARLANT
2024-12-02 10:09 Nicolas PARLANT

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox