Commit Graph
1082571 Commits
Author SHA1 Message Date
Zurab Kvachadze 2ce0f85d0c nginx{,-module}.eclass: save NGINX build config by storing ./configure flags
Background
==========

NGINX's ABI and API can change depending on supplied ./configure flags
(most notoriously, enabling/disabling many first-party modules can
change ABI and API of NGINX as a whole). Perhaps unrelated, but
third-party modules are expected to be built in-tree, at the same time
NGINX is built. It is because of these two factors that we have to
freeze/preserve NGINX configuration.

Configuration-saving methods
============================

In general, I have identified two approaches as to how to preserve NGINX
configuration for building third-party modules out-of-tree.

The current implementation saves the generated headers:
ngx_auto_config.h and ngx_auto_headers.h. When third-party modules are
built, the ./configure flags are mostly ignored. It is straightforward
and easy and allowed us to cut some parts of configuration out.
Unfortunately, due to headers not being first-class configuration in the
build system, it has proven to be quite difficult to change some parts
of the build using headers alone.

For instance, my initial header-mangling-based implementation of
ngx_force_module (see the following commit) proved to be quite limited
and not really robust. The reason why I used this approach initially is
because when nginx-module.eclass was written, none of the
ngx_force_module fancy crossed my mind.

Second method is saving the ./configure flags themselves. Although
increasing the src_configure time (since we no longer skip phases), this
allows to build modules and edit the build configuration more easily and
correctly. This also gives users/ebuild authors more control since, as
stated above, most ./configure flags are ignored in the header
implementation.

Compatibility
=============

While nginx.eclass completely removes support for emitting
ngx_auto_{config,headers}.h, generating only ./configure flags,
nginx-module.eclass will support both configuration-saving methods for
the time being, allowing users to update www-servers/nginx.

Notes
=====

Passing ./configure flags around makes modules transitively depend on
NGINX's dependencies.

-Wl,--as-needed is added to LDFLAGS since NGINX links external
libraries needed by first-party modules also to third-party modules.

Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:43 +01:00
Zurab Kvachadze 7c621cc9bb nginx.eclass: fix http_uwsgi test dependency on uwsgi[ssl]
If http_ssl and http_uwsgi are used together, NGINX runs some tests that
use SSL functionality of UWSGI.

This commit changes the http_uwsgi test dependency to depend on
uwsgi[ssl].

We could have opted for a more complex nginx_module_http_ssl-gated
dependency, but this is simple and it works.

Closes: https://bugs.gentoo.org/977774
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:42 +01:00
Zurab Kvachadze 538151e468 nginx-module.eclass: documentation improvements
Delete the mention of NGINX_MOD_S, clarify when and what variables do.

Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:41 +01:00
Zurab Kvachadze b46239f7ec www-nginx/ngx-acme: Revbump 0.3.1 to r1, depend on nginx[http_ssl]
ngx-acme explicitly requires http_ssl so 0.3.1-r1 now correctly depends
on it using ngx_gen_dep().

Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:40 +01:00
Zurab Kvachadze a132af3b81 nginx-module.eclass: Add ngx_gen_dep() helper
The function generates the proper dependency string for depending on
specific first-party NGINX modules. This is useful for modules that
really depend (call respective APIs, access inner structs, etc) on some
first-party modules.

Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:38 +01:00
Zurab Kvachadze 5bfc77b489 nginx-module.eclass: src_test(): Prepend pkg_sonames with NGINX_S
Before e0b1493dce (nginx-module.eclass: Use S as NGINX_MOD_S, use
NGINX_S for build system, 2026-02-08), S pointed to NGINX_S, fake NGINX
build env. In that commit, S was changed to point to what was
NGINX_MOD_S at the time, i.e., the root of the module sources.

Unfortunately, while correctly removing usages of NGINX_MOD_S, I missed
the usage of S as NGINX_S in nginx-module_src_test() in pkg_sonames.

pkg_sonames is an array holding the absolute paths to the shared objects
of the current module. pkg_sonames is used to load those shared objects
to test them in nginx-module_src_test().

We prepend ${S} to each shared object, while actually needing NGINX_S
since e0b1493dce.

This commit fixes the definition of pkg_sonames to correctly prepend
NGINX_S instead of S.

Closes: https://bugs.gentoo.org/978429
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:37 +01:00
Zurab Kvachadze 834d88a907 nginx.eclass: src_install(): add missing dies for sed
Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:36 +01:00
Zurab Kvachadze f86d82e09d nginx-module.eclass: src_configure(): remove redundant check in ngx_mod_link_module
for loop does not fire at all if the array is empty.

Signed-off-by: Zurab Kvachadze <zurabid2016@gmail.com>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/1329
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 21:27:35 +01:00
Jay Faulkner 46fa69c061 dev-util/claude-code: add 2.1.220, drop 2.1.212
Signed-off-by: Jay Faulkner <jayf@gentoo.org>
2026-07-31 13:23:48 -07:00
Jay Faulkner c39252bd13 dev-util/claude-code: Use system cert store
Added configuration to managed-settings which will cause claude-code to
default to using system certificate store.

Closes: https://bugs.gentoo.org/979723
Signed-off-by: Jay Faulkner <jayf@gentoo.org>
2026-07-31 13:23:48 -07:00
Jay Faulkner 1ca3ef9a37 dev-util/claude-code: Cleanup files
managed-settings.json is no longer used; removed from files.

Signed-off-by: Jay Faulkner <jayf@gentoo.org>
2026-07-31 13:23:48 -07:00
Jay Faulkner 78ef059cec dev-util/claude-code: add 2.1.212, drop 2.1.211
Signed-off-by: Jay Faulkner <jayf@gentoo.org>
2026-07-31 13:23:47 -07:00
Arthur Zamarin 1566479173 dev-util/pkgdev: add 0.2.16
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
2026-07-31 22:56:19 +03:00
Arthur Zamarin 8c15066e9b dev-util/pkgcheck: add 0.10.42
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
2026-07-31 22:54:44 +03:00
Arthur Zamarin 581b46ae81 sys-apps/pkgcore: add 0.12.37
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
2026-07-31 22:36:55 +03:00
Arthur Zamarin e4c5ebfc1d dev-python/snakeoil: add 0.11.3
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
2026-07-31 22:36:54 +03:00
Michał Górny c4dc2698d6 dev-python/pebble: Fix uncleared writer_mutex on unlink()
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-07-31 21:13:54 +02:00
Michał Górny 5bc868ea5f dev-python/requests-cache: Enable py3.15
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-07-31 21:13:54 +02:00
Michał Górny b938d4c575 dev-python/b2sdk: Enable py3.15
Signed-off-by: Michał Górny <mgorny@gentoo.org>
2026-07-31 21:13:54 +02:00
Sam James dfc17aade3 app-emacs/company-mode: Keyword 1.1.0 ppc, #980190
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:27 +01:00
Sam James b7608c303e app-emacs/posframe: Keyword 1.5.2 ppc, #980190
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:27 +01:00
Sam James 36dbf930df app-emacs/company-mode: Keyword 1.1.0 ppc64, #980190
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:25 +01:00
Sam James 10a1a61e24 app-emacs/posframe: Keyword 1.5.2 ppc64, #980190
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:25 +01:00
Sam James ceee018c5f dev-python/feedparser-sgmllib: Keyword 2.0.1 x86, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:23 +01:00
Sam James 0b8fd0376d dev-python/feedparser: Keyword 6.0.14 x86, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:22 +01:00
Sam James 6b908c5848 sys-auth/pam_xdg: Keyword 0.8.5 x86, #980119
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:20 +01:00
Sam James 046deb6cd5 sys-auth/pambase: Keyword 20260730 x86, #980119
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:08:20 +01:00
Sam James 9d10ab4b36 app-editors/nano: add 9.2
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 20:07:35 +01:00
Alfredo Tupone 0969e5e54a dev-libs/cutlass: add 4.4.2
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
2026-07-31 21:00:38 +02:00
Lothar Serra Mari 41ffa60915 dev-lang/php: add 8.4.24, drop 8.4.23
Closes: https://github.com/gentoo/gentoo/pull/46627
Signed-off-by: Lothar Serra Mari <mail@serra.me>
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
2026-07-31 14:51:48 -04:00
Lothar Serra Mari 8f95157346 dev-lang/php: add 8.3.33, drop 8.3.32
Signed-off-by: Lothar Serra Mari <mail@serra.me>
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
2026-07-31 14:51:48 -04:00
Sam James 427edbf2d6 dev-python/feedparser-sgmllib: Keyword 2.0.1 ppc, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 19:47:27 +01:00
Sam James 7413b162c8 dev-python/feedparser: Keyword 6.0.14 ppc, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 19:47:26 +01:00
Sam James 6b088bbdeb dev-python/feedparser-sgmllib: Keyword 2.0.1 ppc64, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 19:47:24 +01:00
Sam James 51570a3767 dev-python/feedparser: Keyword 6.0.14 ppc64, #980169
Signed-off-by: Sam James <sam@gentoo.org>
2026-07-31 19:47:23 +01:00
Zac Medico bb2b8f9293 app-misc/yq: Revbump to fix yq-symlink
Closes: https://bugs.gentoo.org/980187
Signed-off-by: Zac Medico <zmedico@gentoo.org>
2026-07-31 11:41:49 -07:00
Zac Medico 6d48b808b1 app-misc/yq: fix for pypy
Signed-off-by: Zac Medico <zmedico@gentoo.org>
2026-07-31 11:30:16 -07:00
Zac Medico 71dcae2769 app-misc/yq: drop 3.4.4, 4.1.2
Signed-off-by: Zac Medico <zmedico@gentoo.org>
2026-07-31 11:23:53 -07:00
Zac Medico 1d63bf3779 app-misc/yq: Revbump to fix yq-symlink
Bug: https://bugs.gentoo.org/980187
Signed-off-by: Zac Medico <zmedico@gentoo.org>
2026-07-31 11:23:38 -07:00
Alfredo Tupone b0cc8ac968 sci-ml/kineto: drop -Werror from cmake
Closes: https://bugs.gentoo.org/980183
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
2026-07-31 19:38:36 +02:00
Maciej Barć b1e2252b4b media-gfx/curtail: fix build deps - add blueprint-compiler
Closes: https://bugs.gentoo.org/978739
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:25 +02:00
Maciej Barć 178c48d535 sys-apps/polychromatic: symc live 9999
Bug: https://bugs.gentoo.org/974138
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:24 +02:00
Maciej Barć 72a7893da5 sys-apps/polychromatic: drop old 0.9.6
Closes: https://bugs.gentoo.org/974138
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:24 +02:00
Maciej Barć ba30cba2ba sys-apps/razercommander: drop old 1.2.1.2-r4
Closes: https://bugs.gentoo.org/974140
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:23 +02:00
Maciej Barć c9b6792963 app-emulation/uxn: drop the live 9999 ebuild
because upstream changed structure of this and sibling projects

Closes: https://bugs.gentoo.org/979408
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:22 +02:00
Maciej Barć 457235e0eb dev-lang/crystal: bump to 1.21.0
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:22 +02:00
Maciej Barć 2c0872b7e9 app-emacs/flycheck: bump to 38.3
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:21 +02:00
Maciej Barć 37f43b8283 app-emacs/company-mode: bump to 1.1.0
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:21 +02:00
Maciej Barć 78393eabd3 app-emacs/org-mode: bump to 9.8.8
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:20 +02:00
Maciej Barć 02a8a49dc0 app-emacs/cider: bump to 2.0.1
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
2026-07-31 19:31:19 +02:00