# HG changeset patch # User Franz Glasner # Date 1665583398 -7200 # Node ID 5ca2e3bea583b231e8b7401a2283a966e29a1e29 # Parent 6c1e9754daa4ceaea69ca68dbdc4e8e1f8de3b95 Better log message when building *extra* plugins: put the word "extra" into the message diff -r 6c1e9754daa4 -r 5ca2e3bea583 uwsginl/files/patch-uwsgiconfig.py --- a/uwsginl/files/patch-uwsgiconfig.py Wed Oct 12 15:11:09 2022 +0200 +++ b/uwsginl/files/patch-uwsgiconfig.py Wed Oct 12 16:03:18 2022 +0200 @@ -10,11 +10,10 @@ print(binary_link_cmd) if subprocess.call(binary_link_cmd, shell=True) != 0: raise Exception('unable to link binary file') -@@ -1591,6 +1592,17 @@ def build_plugin(path, uc, cflags, ldflags, libs, name +@@ -1593,6 +1594,18 @@ def build_plugin(path, uc, cflags, ldflags, libs, name + print("*** %s plugin built and available in %s ***" % (name, plugin_dest + '.so')) - print("build time: %d seconds" % (time.time() - plugin_started_at)) - print("*** %s plugin built and available in %s ***" % (name, plugin_dest + '.so')) -+ + +def get_default_target_emulation(): + """Need a target emulation on FreeBSD (ld, ld.lld when linking binary/raw""" + emul = "" @@ -25,6 +24,17 @@ + if emul: + return "-m %s" % emul + return "" - - ++ ++ def vararg_callback(option, opt_str, value, parser): + assert value is None + value = [] +@@ -1682,7 +1695,7 @@ if __name__ == "__main__": + print("*** uWSGI building and linking plugin %s ***" % options.plugin[0]) + build_plugin(options.plugin[0], uc, cflags, ldflags, libs, name) + elif options.extra_plugin: +- print("*** uWSGI building and linking plugin from %s ***" % options.extra_plugin[0]) ++ print("*** uWSGI building and linking extra plugin from %s ***" % options.extra_plugin[0]) + cflags = os.environ['UWSGI_PLUGINS_BUILDER_CFLAGS'].split() + os.environ.get("CFLAGS", "").split() + cflags.append('-I.uwsgi_plugins_builder/') + ldflags = os.environ.get("LDFLAGS", "").split()