f7ea606b47
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, mongrel2 fails to build with output:
Applying 0001-Do-not-run-tests.patch using patch:
patching file Makefile
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file tools/m2sh/Makefile
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file tools/m2sh/Makefile.rej
Applying 0003-fix-build-with-gcc-4.8.patch using patch:
patching file Makefile
patching file tools/m2sh/Makefile
Hunk #1 FAILED at 10.
1 out of 2 hunks FAILED -- saving rejects to file tools/m2sh/Makefile.rej
This commit refreshes the package patches on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 3cbef2195533f357c8a80c2840108662461273b7 Mon Sep 17 00:00:00 2001
|
|
From: Lionel Orry <lionel.orry@gmail.com>
|
|
Date: Wed, 27 Mar 2013 14:48:19 +0100
|
|
Subject: [PATCH] Do not run tests.
|
|
|
|
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 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 7dc4089..ca72630 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -18,7 +18,7 @@
|
|
TESTS=$(patsubst %.c,%,${TEST_SRC})
|
|
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
|
|
|
|
${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
|
|
@@ -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
|
|
|
|
dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
|
|
dev: all
|
|
--
|
|
1.8.1.4
|
|
|