Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compiling and linking the php plugin in uwsgi #97536

Merged
merged 4 commits into from
Dec 21, 2020
Merged

Fix compiling and linking the php plugin in uwsgi #97536

merged 4 commits into from
Dec 21, 2020

Commits on Dec 21, 2020

  1. uwsgi: set UWSGICONFIG_PHPPATH to the php.dev store 

    uwsgi needs to run php-config to get the include path. set the
UWSGICONFIG_PHPPATH to the php-config in the php.dev store.

Patch common.h to directly include php_session.h (since it's a separate package on
nixos).

NIX_CFLAGS_LINK was removed since it doesn't seem to be used at all

https://github.com/unbit/uwsgi/blob/master/plugins/php/common.h
    @gdamjan
    gdamjan committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    fd018e9 View commit details
    Browse the repository at this point in the history

  2. uwsgi: the php plugin needs to link with session.so 

    On NixOS the session.so php extension is a separate package (and not builtin
in libphp.so). But since the uwsgi php plugin uses the session
mechanisms, we need to link the plugin to that library too.

With this change uwsgipluginpy is hacked to take an additional UWSGICONFIG_PHP_LDFLAGS
environment variable and add it to its LDFLAGS, and then in the nix
expression the UWSGICONFIG_PHP_LDFLAGS is set to point to php.extensions.session
    @gdamjan
    gdamjan committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    22e8804 View commit details
    Browse the repository at this point in the history

  3. nixos/tests/uwsgi: test PHP plugin

    @rnhmjoj @gdamjan
    rnhmjoj authored and gdamjan committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    c32ef21 View commit details
    Browse the repository at this point in the history

  4. uwsgi: add passthru.tests.uwsgi to derivation

    @gdamjan
    gdamjan committed Dec 21, 2020
    Configuration menu
    Copy the full SHA
    e189177 View commit details
    Browse the repository at this point in the history