mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-16 23:19:31 +00:00
455b886fc8dep for dev-lua/lua-http and optional for net-dns/knot-resolver Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Signed-off-by: Sam James <sam@gentoo.org>
48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
--- a/src/GNUmakefile 2024-12-10 19:37:27.380639046 -0000
|
|
+++ b/src/GNUmakefile 2024-12-10 19:37:56.648169798 -0000
|
|
@@ -22,7 +22,7 @@
|
|
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 @@
|
|
$$(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)/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
|
|
--- a/src/cqueues.h 2024-12-10 19:37:27.380639046 -0000
|
|
+++ b/src/cqueues.h 2024-12-10 19:37:38.028468322 -0000
|
|
@@ -40,7 +40,7 @@
|
|
#include <lualib.h>
|
|
#include <lauxlib.h>
|
|
|
|
-#include "../vendor/compat53/c-api/compat-5.3.h"
|
|
+#include <compat-5.3.h>
|
|
|
|
|
|
/*
|