[arch-commits] Commit in uwsgi/trunk (PKGBUILD archlinux.ini)

[David Runge]

    Date: Saturday, February 27, 2021 @ 12:40:19
  Author: dvzrv
Revision: 874910

upgpkg: uwsgi 2.0.19.1-10: Rebuild to simplify build of php7 plugin.

Remove php7 plugin from list of plugins in distribution config.
Copy sources of php plugin only to remove faulty linking in the case of the default plugin.
Build the php7 plugin separately while overriding which php-config to use.

Modified:
  uwsgi/trunk/PKGBUILD
  uwsgi/trunk/archlinux.ini

---------------+
 PKGBUILD      |   23 +++++++++++------------
 archlinux.ini |    2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-27 12:36:11 UTC (rev 874909)
+++ PKGBUILD	2021-02-27 12:40:19 UTC (rev 874910)
@@ -25,7 +25,7 @@
   uwsgi-plugin-notfound
 )
 pkgver=2.0.19.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A full stack for building hosting services"
 arch=(x86_64)
 url="https://uwsgi-docs.readthedocs.io/en/latest/"
@@ -68,7 +68,7 @@
   "${pkgbase}-2.0.19.1-php8.patch"
 )
 sha512sums=('e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf'
-            'f9f411cf63e724078e76113c7159012c3f84da1672cb86d219137617c4278723356bd128e66225568273d908005e3b8ee3603c40eb659263b129897921d7addf'
+            'f2be78fb77938ced8a4edb2899e4ee532bfc48cdc04b26a18c69e618bde869b19b546d1bf60decc5dc95de09de81a5bdd4f071501ce5c5d735eac158a995d5ed'
             'd54c84838ddb2f389e115ebb81aa2583705c9e330f020e6583b496f9c271ed236b6820c2a065f2b55a79adbf13e262b9ff2428124a8044b8fa20ca29ca4930ac'
             '068ada6281fdeb504fed7e47dae2729d047ed810bb596e5268c1821ad275cd32110e801e93e7ba0ee2d92dbc39e1954180cf43d88d2990d42b802ceb54b50a9e'
             '592c85270f43b37e9c51aae126533830515b96fff9fcae969ee865fe173bd0550c7729530d5ff1e44ffee43cd5c78c96688ce091c677a4196379e24983c0180e'
@@ -80,7 +80,7 @@
             '162ca1be96282b32e8e6be919b6315bfd08954c491056958985bf99e7f5bdad3511665f059329d6cb6ef5d222f9aa11d4dc43c72e6a963ab941ada959fe8d964'
             '91b9548bb24eb4fff86ff867121edab92b531db04dacf5402b9bd8849632edfbfa0878e244bf5d243f34dcd5ee0df0ad136c888a4f27984dd6a96fd7b5e0959e')
 b2sums=('3f13da44081e85dfee01c827593656c0d1074a0217ca5fde5424ff36e0ae529d506f65a2bca658bd7df0a07520cae21cf8ce72ec85c767ec73304afd8a70b89e'
-        '9ebfca60236363e113b3813d29e55d47f9aeef4c50db4e084690a94fa1f566ad7af626cac92cc671a1a31d40bad27d8dcacd4b85b767c6ea37a0d641626fa855'
+        '4a1e79fd4d450de11079b305f1b82660c6632ca6a2f15e641ab1a404a3b867c2439aa6031cc95956ff75ac21960f8734d7b1bec28330fecbfe95af3023ec8a32'
         '835a1036422e9821cd52ffdf5a6053bdd59fc700d473600bda60b6730746f6c0750c30c85f4139d3ea81c6b6dd10d6849f9406decee3179861c51aca90da6161'
         '80aa3c4d3f0310f5029ac01690d2ba718d8c86fa49cd1b4f3fc1bd5ae9eadaed6562bf0a48a0fd611e92f100a8594e08fb4bae58e25765fc2eb648cdf1c60b35'
         'b6838c0c91811d4b677bf0f558134c69015708c308ef7080df328f12b0b0d58ae6cdebe277c29b6d11c20cfeb0847a4934e3a8924323e57ed661d6e9f6656a34'
@@ -109,17 +109,13 @@
   mv plugins/ruby{19,}
   sed -e 's/ruby19/ruby/' \
       -i plugins/ruby/uwsgiplugin.py
-  # remove the explicit lib version from the linking stage of the PHP plugins
+  # duplicate the php plugin, so that we can modify it (and leave the php7
+  # version unmodified)
+  cp -av plugins/php{,7}
+  # remove the explicit lib version from the linking stage of the PHP plugin as
+  # we do not provide /usr/lib/libphp8.so
   sed -e "s/ + php_version//" \
       -i plugins/php/uwsgiplugin.py
-  # duplicate and modify php plugin for php7
-  cp -av plugins/php{,7}
-  mv -v plugins/php7/php{,7}_plugin.c
-  sed -e "s/'php'/'php7'/" \
-      -e 's/php-config/php-config7/g' \
-      -e 's/php_plugin/php7_plugin/g' \
-      -e 's/lphp/lphp7/g' \
-      -i plugins/php7/uwsgiplugin.py
   # copy our custom build profile into place
   cp -v ../archlinux.ini buildconf/
 }
@@ -127,6 +123,9 @@
 build() {
   cd "$pkgbase-$pkgver"
   python uwsgiconfig.py --verbose --build archlinux
+  # build php7 plugin separately and override php-config in use
+  UWSGICONFIG_PHPPATH='php-config7' \
+  python uwsgiconfig.py --verbose --plugin plugins/php7 archlinux php7
 }
 
 package_uwsgi() {

Modified: archlinux.ini
===================================================================
--- archlinux.ini	2021-02-27 12:36:11 UTC (rev 874909)
+++ archlinux.ini	2021-02-27 12:40:19 UTC (rev 874910)
@@ -1,6 +1,6 @@
 [uwsgi]
 plugin_build_dir = .
 plugin_dir = /usr/lib/uwsgi
-plugins = asyncio, cgi, fiber, gevent, greenlet, jvm, php, php7, lua, mono, notfound, psgi, pypy, python, rack, rbthreads, webdav, zabbix
+plugins = asyncio, cgi, fiber, gevent, greenlet, jvm, php, lua, mono, notfound, psgi, pypy, python, rack, rbthreads, webdav, zabbix
 main_plugin = systemd_logger,pam
 inherit = base