mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-18 03:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev-lua/cqueues: use upstream compat53

Browse Source 
last clean of *flags

Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
This commit is contained in:
Nicolas PARLANT
2024-12-03 16:58:09 +00:00
parent b0557a4973
commit cd433ef5bd
3 changed files with 103 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-lua/cqueues/files/cqueues-20200726-5-4_tests.patch
View File

@@ -1,6 +1,3 @@
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
---

62
dev-lua/cqueues/files/cqueues-20200726-rm-vendor-compat53.patch Normal file
View File

@@ -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 $(<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