|
@@ -7,6 +7,8 @@ This patch is specific to cross-compiled environments and avoids running
|
|
|
the tests on the host. It is not meant to be applied upstream.
|
|
|
|
|
|
Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
|
|
|
+[Dario: make the patch to be applied with fuzz factor 0]
|
|
|
+Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
|
---
|
|
|
Makefile | 2 +-
|
|
|
tools/m2sh/Makefile | 2 +-
|
|
@@ -16,22 +18,22 @@ diff --git a/Makefile b/Makefile
|
|
|
index 7dc4089..ca72630 100644
|
|
|
--- a/Makefile
|
|
|
+++ b/Makefile
|
|
|
-@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c)
|
|
|
+@@ -18,7 +18,7 @@
|
|
|
TESTS=$(patsubst %.c,%,${TEST_SRC})
|
|
|
- MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
|
|
|
+ MAKEOPTS=OPTFLAGS="${CFLAGS} ${NOEXTCFLAGS} ${OPTFLAGS}" LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
|
|
|
|
|
|
-all: bin/mongrel2 tests m2sh procer
|
|
|
+all: bin/mongrel2 m2sh procer filters config_modules
|
|
|
|
|
|
- dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
|
|
|
- dev: all
|
|
|
+ ${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS}
|
|
|
+ ${OBJECTS}: | builddirs
|
|
|
diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
|
|
|
index b50d8a0..334e4da 100644
|
|
|
--- a/tools/m2sh/Makefile
|
|
|
+++ b/tools/m2sh/Makefile
|
|
|
-@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC})
|
|
|
- LIB_SRC=$(filter-out src/m2sh.c,${SOURCES})
|
|
|
- LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
|
|
|
+@@ -12,7 +12,7 @@
|
|
|
+
|
|
|
+ $(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter
|
|
|
|
|
|
-all: ../lemon/lemon tests build/m2sh
|
|
|
+all: ../lemon/lemon build/m2sh
|