diff options
| author | Nicolas PARLANT <nicolas.parlant@parhuet.fr> | 2024-12-10 15:25:58 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2024-12-11 02:09:30 +0000 |
| commit | 455b886fc8584ab2d8df17739835ae1f33a0f71b (patch) | |
| tree | 2faa530332f0042cfc26bd118a2a81190d59a155 /dev-lua/cqueues/files | |
| parent | e00f685c7b0e2237dfc2a7c531b9ffb6d08fbc60 (diff) | |
| download | gentoo-455b886fc8584ab2d8df17739835ae1f33a0f71b.tar.gz gentoo-455b886fc8584ab2d8df17739835ae1f33a0f71b.tar.bz2 gentoo-455b886fc8584ab2d8df17739835ae1f33a0f71b.zip | |
dev-lua/cqueues: new package, add 20200726_p20241204
dep 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>
Diffstat (limited to 'dev-lua/cqueues/files')
| -rw-r--r-- | dev-lua/cqueues/files/cqueues-20200726_p20241204-qa-flags.patch | 39 | ||||
| -rw-r--r-- | dev-lua/cqueues/files/cqueues-20200726_p20241204-rm-vendor-compat53.patch | 48 |
2 files changed, 87 insertions, 0 deletions
diff --git a/dev-lua/cqueues/files/cqueues-20200726_p20241204-qa-flags.patch b/dev-lua/cqueues/files/cqueues-20200726_p20241204-qa-flags.patch new file mode 100644 index 000000000000..a1f654877c04 --- /dev/null +++ b/dev-lua/cqueues/files/cqueues-20200726_p20241204-qa-flags.patch @@ -0,0 +1,39 @@ +--- a/GNUmakefile 2024-12-10 19:17:18.107965992 -0000 ++++ b/GNUmakefile 2024-12-10 19:17:25.319850369 -0000 +@@ -19,7 +19,6 @@ + LUAPATH_FN = $(shell env CC='$(subst ',\\',$(CC))' CPPFLAGS='$(subst ',\\',$(CPPFLAGS))' LDFLAGS='$(subst ',\\',$(LDFLAGS))' $(LUAPATH) -krxm3 -I '$(subst ',\\',$(DESTDIR)$(includedir))' -I/usr/include -I/usr/local/include -P '$(subst ',\\',$(DESTDIR)$(bindir))' -P '$(subst ',\\',$(bindir))' -L '$(subst ',\\',$(DESTDIR)$(libdir))' -L '$(subst ',\\',$(libdir))' -v$(1) $(2)) + + # check whether luapath can locate Lua $(1) headers +-HAVE_API_FN = $(and $(filter $(1),$(call LUAPATH_FN,$(1),version)),$(1)$(info enabling Lua $(1))) + + # check whether $(1) in LUA_APIS or $(LUA$(1:.=)_CPPFLAGS) is non-empty + WITH_API_FN = $$(and $$(or $$(filter $(1),$$(LUA_APIS)),$$(LUA$(subst .,,$(1))_CPPFLAGS)),$(1)) +@@ -168,18 +167,15 @@ + ifeq ($(origin ALL_CFLAGS), undefined) + + ifeq ($(VENDOR_CC_$(d)), gcc) +-ALL_CFLAGS += -O2 -std=gnu99 -fPIC +-ALL_CFLAGS += -g -Wall -Wextra $(call cc-option, -Wno-missing-field-initializers) $(call cc-option, -Wno-override-init) -Wno-unused ++ALL_CFLAGS += -std=gnu99 -fPIC + endif + + ifeq ($(VENDOR_CC_$(d)), clang) +-ALL_CFLAGS += -O2 -std=gnu99 -fPIC +-ALL_CFLAGS += -g -Wall -Wextra -Wno-missing-field-initializers -Wno-initializer-overrides -Wno-unused -Wno-dollar-in-identifier-extension ++ALL_CFLAGS += -std=gnu99 -fPIC + endif + + ifeq ($(VENDOR_CC_$(d)), sunpro) + ALL_CFLAGS += -xcode=pic13 +-ALL_CFLAGS += -g + # + # Solaris Studio supports anonymous unions just fine; but it complains + # incessantly about them. +@@ -215,7 +211,6 @@ + # + ifeq ($(origin ALL_LDFLAGS), undefined) + +-ALL_LDFLAGS += -L$(DESTDIR)$(libdir) -L$(libdir) + ALL_LDFLAGS += $(LDFLAGS) + + endif # ALL_LDFLAGS diff --git a/dev-lua/cqueues/files/cqueues-20200726_p20241204-rm-vendor-compat53.patch b/dev-lua/cqueues/files/cqueues-20200726_p20241204-rm-vendor-compat53.patch new file mode 100644 index 000000000000..ed25b17ba21a --- /dev/null +++ b/dev-lua/cqueues/files/cqueues-20200726_p20241204-rm-vendor-compat53.patch @@ -0,0 +1,48 @@ +--- 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> + + + /* |
