From 9eefad0ad1f4a1f9eb604ea20736422fe19ef548 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sun, 15 Jul 2018 22:43:52 +0200 Subject: [PATCH] uwsgi-cgi: General cleanup * Remove stray LICENSE file added to repo * Use codeload instead of git * Add proper (as close as possible) SPDX license * Drop OpenSSL, PCRE and Libxml2 as dependencies Makes it more suitable alternative for small flash devices * Drop /etc/uwsgi as there's only one config file * Remove stray /etc/nginx directory * Reorganize configuration file * Convert init.d script to use procd * Hardset 3 threads and processes, seems like a good tradeoff between performance and memory usage instead of doing auto scaling based on amout of cpu cores/threads Non-scientific benchmark (tm) ramips, mt7621, WiTi Board 16/256M 1. 3 threads, 6 processes 2. 2 threads, 2 processes 3. 3 threads, 3 processes - LuCI Main page 1.48s 1.72s 1.64s - Status --> Firewall 6.24s 6.39s 6.40s - Status --> Kernel log 266ms 256ms 251ms - Network --> Firewall 936ms 1.08s 1.07s - Network --> Wireless 1.39s 1.42s 1.40s Signed-off-by: Daniel Engberg --- net/uwsgi-cgi/LICENSE | 355 ------------------ net/uwsgi-cgi/Makefile | 19 +- net/uwsgi-cgi/files-luci-support/uwsgi.conf | 52 ++- net/uwsgi-cgi/files-luci-support/uwsgi.init | 41 +- .../patches/001-remove-unused-deps.patch | 17 + .../patches/002-dont-hardcode-zlib.patch | 19 + ...dont-override-toolchain-optimization.patch | 11 + 7 files changed, 90 insertions(+), 424 deletions(-) delete mode 100644 net/uwsgi-cgi/LICENSE create mode 100644 net/uwsgi-cgi/patches/001-remove-unused-deps.patch create mode 100644 net/uwsgi-cgi/patches/002-dont-hardcode-zlib.patch create mode 100644 net/uwsgi-cgi/patches/003-dont-override-toolchain-optimization.patch diff --git a/net/uwsgi-cgi/LICENSE b/net/uwsgi-cgi/LICENSE deleted file mode 100644 index 9c4309b10c..0000000000 --- a/net/uwsgi-cgi/LICENSE +++ /dev/null @@ -1,355 +0,0 @@ ----------------------------------------------------------------------- - -LINKING EXCEPTION - - In addition to the permissions in the GNU General Public License, - the authors give you unlimited permission to link the compiled - version of this library into combinations with other programs, - and to distribute those combinations without any restriction - coming from the use of this file. (The General Public License - restrictions do apply in other respects; for example, they cover - modification of the file, and distribution when not linked into - a combined executable.) - ----------------------------------------------------------------------- - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/net/uwsgi-cgi/Makefile b/net/uwsgi-cgi/Makefile index b80472ea8b..ec4c0f4744 100644 --- a/net/uwsgi-cgi/Makefile +++ b/net/uwsgi-cgi/Makefile @@ -2,15 +2,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uwsgi-cgi PKG_VERSION:=2.0.17.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/unbit/uwsgi -PKG_SOURCE_DATE:=2018-07-08 -PKG_SOURCE_VERSION:=4b3e9621c0a3eb2aacf937b8e84e67b23b20490b -PKG_MIRROR_HASH:=a843909ad5e8c36b86392d99c8bd411a84c14ad51993ba63638180212c7819e2 +PKG_SOURCE_URL=https://codeload.github.com/unbit/uwsgi/tar.gz/$(PKG_VERSION)? +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_HASH:=d2318235c74665a60021a4fc7770e9c2756f9fc07de7b8c22805efe85b5ab277 +PKG_BUILD_DIR:=$(BUILD_DIR)/uwsgi-$(PKG_VERSION) -PKG_LICENSE:=GPL2 + linking exception +PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Ansuel Smith @@ -23,7 +22,7 @@ define Package/uwsgi-cgi SUBMENU:=Web Servers/Proxies TITLE:=The uWSGI server URL:=http://unbit.com/ - DEPENDS:=+libcap +libopenssl +libpcre +jansson +libuuid +libxml2 + DEPENDS:=+libcap +jansson +libuuid endef define Package/uwsgi-cgi-luci-support @@ -54,9 +53,7 @@ endef define Package/uwsgi-cgi-luci-support/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files-luci-support/uwsgi.init $(1)/etc/init.d/uwsgi - $(INSTALL_DIR) $(1)/etc/uwsgi - $(INSTALL_BIN) ./files-luci-support/uwsgi.conf $(1)/etc/uwsgi/uwsgi.conf - $(INSTALL_DIR) $(1)/etc/nginx + $(INSTALL_BIN) ./files-luci-support/uwsgi.conf $(1)/etc/uwsgi.conf endef $(eval $(call BuildPackage,uwsgi-cgi)) diff --git a/net/uwsgi-cgi/files-luci-support/uwsgi.conf b/net/uwsgi-cgi/files-luci-support/uwsgi.conf index 84c32bbfb3..82cbbb1d32 100644 --- a/net/uwsgi-cgi/files-luci-support/uwsgi.conf +++ b/net/uwsgi-cgi/files-luci-support/uwsgi.conf @@ -1,28 +1,26 @@ [uwsgi] -stric = True -uwsgi_modifier1 = 9 -socket = /var/run/uwsgi.sock -cgi-mode = true -cgi = /www/cgi-bin/luci -chdir = /usr/lib/lua/luci/ -master = True -buffer-size = 10000 -reload-mercy=8 -max-requests=2000 -limit-as=200 -reload-on-as=256 -reload-on-rss=192 -no-orphans=True -vacuum=True -enable-threads=True -post-buffering=8192 -socket-timeout=120 -thunder-lock = True -logger = syslog:uwsgi -daemonize = True -disable-logging = True -log-format = %(addr) %(method) %(uri) => generated %(rsize) bytes in %(msecs) msecs -pidfile=/var/run/uwsgi.pid -die-on-term=True -fork-socket=True -pcre-jit=True \ No newline at end of file +strict = true +socket = /var/run/uwsgi.sock +cgi-mode = true +cgi = /www/cgi-bin/luci +chdir = /usr/lib/lua/luci/ +master = true +buffer-size = 10000 +reload-mercy = 8 +max-requests = 2000 +limit-as = 200 +reload-on-as = 256 +reload-on-rss = 192 +no-orphans = true +vacuum = true +enable-threads = true +post-buffering = 8192 +socket-timeout = 120 +thunder-lock = true +logger = syslog:uwsgi +disable-logging = true +log-format = %(addr) %(method) %(uri) => generated %(rsize) bytes in %(msecs) msecs +pidfile = /var/run/uwsgi.pid +die-on-term = true +threads = 3 +processes = 3 diff --git a/net/uwsgi-cgi/files-luci-support/uwsgi.init b/net/uwsgi-cgi/files-luci-support/uwsgi.init index 7897180f60..af2a307e9a 100644 --- a/net/uwsgi-cgi/files-luci-support/uwsgi.init +++ b/net/uwsgi-cgi/files-luci-support/uwsgi.init @@ -1,34 +1,13 @@ -#!/bin/sh /etc/rc.common +#!/bin/sh /etc/rc.common START=79 - -start() { - core_number=$(grep -c ^processor /proc/cpuinfo) - /usr/sbin/uwsgi --ini /etc/uwsgi/uwsgi.conf --threads $core_number --processes $(($core_number * 2)) - logger -ts "Uwsgi" "Starting Uwsgi process" -} - -stop() { - pidfile="/var/run/uwsgi.pid" - if [ -n "$(pgrep uwsgi)" ]; then - if [ -f $pidfile ]; then - logger -t "Uwsgi" "Stopping Uwsgi process" - kill $( cat $pidfile ) - else - for pid in $(pgrep uwsgi); do - if [ -n "$(pgrep uwsgi)" ]; then - #Keep trying to kill until the master process is found - kill -KILL $pid - fi - done - fi - else - logger -t "Uwsgi" "Uwsgi not running!" - fi -} - -reload() { - /usr/sbin/uwsgi --reload /var/run/uwsgi.pid -} - +USE_PROCD=1 + +start_service() { + procd_open_instance + procd_set_param command /usr/sbin/uwsgi --ini /etc/uwsgi.conf + procd_set_param file /etc/uwsgi.conf + procd_set_param respawn + procd_close_instance + } diff --git a/net/uwsgi-cgi/patches/001-remove-unused-deps.patch b/net/uwsgi-cgi/patches/001-remove-unused-deps.patch new file mode 100644 index 0000000000..2b058c302a --- /dev/null +++ b/net/uwsgi-cgi/patches/001-remove-unused-deps.patch @@ -0,0 +1,17 @@ +--- a/buildconf/base.ini ++++ b/buildconf/base.ini +@@ -1,9 +1,9 @@ + [uwsgi] +-xml = auto +-yaml = true +-json = auto +-ssl = auto +-pcre = auto ++xml = false ++yaml = embedded ++json = jansson ++ssl = false ++pcre = false + routing = auto + debug = false + unbit = false diff --git a/net/uwsgi-cgi/patches/002-dont-hardcode-zlib.patch b/net/uwsgi-cgi/patches/002-dont-hardcode-zlib.patch new file mode 100644 index 0000000000..23ca62d5d0 --- /dev/null +++ b/net/uwsgi-cgi/patches/002-dont-hardcode-zlib.patch @@ -0,0 +1,19 @@ +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -851,11 +851,11 @@ class uConf(object): + self.cflags.append('-DUWSGI_HAS_EXECINFO') + report['execinfo'] = True + +- if self.has_include('zlib.h'): +- self.cflags.append('-DUWSGI_ZLIB') +- self.libs.append('-lz') +- self.gcc_list.append('core/zlib') +- report['zlib'] = True ++# if self.has_include('zlib.h'): ++# self.cflags.append('-DUWSGI_ZLIB') ++# self.libs.append('-lz') ++# self.gcc_list.append('core/zlib') ++ report['zlib'] = False + + if uwsgi_os == 'OpenBSD': + try: diff --git a/net/uwsgi-cgi/patches/003-dont-override-toolchain-optimization.patch b/net/uwsgi-cgi/patches/003-dont-override-toolchain-optimization.patch new file mode 100644 index 0000000000..196edfbdb9 --- /dev/null +++ b/net/uwsgi-cgi/patches/003-dont-override-toolchain-optimization.patch @@ -0,0 +1,11 @@ +--- a/uwsgiconfig.py ++++ b/uwsgiconfig.py +@@ -680,7 +680,7 @@ class uConf(object): + self.include_path += os.environ['UWSGI_INCLUDES'].split(',') + + +- self.cflags = ['-O2', '-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split() ++ self.cflags = ['-I.', '-Wall', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64'] + os.environ.get("CFLAGS", "").split() + self.get('cflags','').split() + + report['kernel'] = uwsgi_os + -- 2.30.2