1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Fix GCC7 build error, this statement may fall through. 2.0.263

This commit is contained in:
winlin 2019-04-05 19:54:32 +08:00
parent 91c462b6ba
commit a554dd85e1
4 changed files with 17 additions and 1 deletions

View file

@ -0,0 +1,12 @@
--- Makefile 2019-04-05 19:43:32.000000000 +0800
+++ ../http-parser-2.1-patch/Makefile 2019-04-05 19:50:26.000000000 +0800
@@ -7,7 +7,8 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA
CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
-CFLAGS += -Wall -Wextra -Werror
+# patch by winlin
+CFLAGS += -Wall -Wextra
CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
CFLAGS_LIB = $(CFLAGS_FAST) -fPIC

View file

@ -482,6 +482,8 @@ if [ $SRS_HTTP_CORE = YES ]; then
rm -rf ${SRS_OBJS}/http-parser-2.1 && cd ${SRS_OBJS} && unzip -q ../3rdparty/http-parser-2.1.zip &&
cd http-parser-2.1 &&
patch -p0 < ../../3rdparty/patches/2.http.parser.patch &&
# Patch build error for https://github.com/ossrs/srs/pull/1312#issuecomment-480243404
patch -p0 < ../../3rdparty/patches/7.http.parser.patch &&
make package &&
cd .. && rm -rf hp && ln -sf http-parser-2.1 hp &&
cd .. && rm -f ${SRS_OBJS}/_flag.st.hp.tmp

View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 262
#define VERSION_REVISION 263
// generated by configure, only macros.
#include <srs_auto_headers.hpp>