summaryrefslogtreecommitdiff
path: root/package/mongrel2/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/mongrel2/patches')
-rw-r--r--package/mongrel2/patches/patch-Makefile30
-rw-r--r--package/mongrel2/patches/patch-tools_m2sh_Makefile31
-rw-r--r--package/mongrel2/patches/patch-tools_procer_Makefile11
3 files changed, 0 insertions, 72 deletions
diff --git a/package/mongrel2/patches/patch-Makefile b/package/mongrel2/patches/patch-Makefile
deleted file mode 100644
index 182389538..000000000
--- a/package/mongrel2/patches/patch-Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- mongrel2-v1.11.0.orig/Makefile 2015-12-31 10:25:17.000000000 +0100
-+++ mongrel2-v1.11.0/Makefile 2016-04-25 20:21:46.996240089 +0200
-@@ -1,6 +1,7 @@
--CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
-+CFLAGS?=
-+CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
- LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
--PREFIX?=/usr/local
-+PREFIX?=/usr
-
- get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
-
-@@ -29,7 +30,7 @@ ifdef $($(shell \
- fi ))
- endif
-
--all: builddirs bin/mongrel2 tests m2sh procer
-+all: builddirs bin/mongrel2 m2sh procer
-
- dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
- dev: all
-@@ -160,8 +161,6 @@ install: all
- || ( install -d $(DESTDIR)/$(PREFIX)/bin/ \
- && install bin/mongrel2 $(DESTDIR)/$(PREFIX)/bin/ )
- ${MAKE} ${MAKEOPTS} -C tools/m2sh install
-- ${MAKE} ${MAKEOPTS} -C tools/config_modules install
-- ${MAKE} ${MAKEOPTS} -C tools/filters install
- ${MAKE} ${MAKEOPTS} -C tools/procer install
-
- examples/python/mongrel2/sql/config.sql: src/config/config.sql src/config/mimetypes.sql
diff --git a/package/mongrel2/patches/patch-tools_m2sh_Makefile b/package/mongrel2/patches/patch-tools_m2sh_Makefile
deleted file mode 100644
index c6296496a..000000000
--- a/package/mongrel2/patches/patch-tools_m2sh_Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- mongrel2-v1.11.0.orig/tools/m2sh/Makefile 2015-12-31 10:25:18.000000000 +0100
-+++ mongrel2-v1.11.0/tools/m2sh/Makefile 2016-04-25 20:14:36.744476585 +0200
-@@ -1,7 +1,8 @@
--CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
-+CFLAGS?=
-+CFLAGS+=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
- LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
-
--PREFIX?=/usr/local
-+PREFIX?=/usr
- SOURCES=$(wildcard src/*.c src/**/*.c)
- OBJECTS=$(patsubst %.c,%.o,${SOURCES})
- TEST_SRC=$(wildcard tests/*.c)
-@@ -9,7 +10,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC})
- LIB_SRC=$(filter-out src/m2sh.c,${SOURCES})
- LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
-
--all: ../lemon/lemon tests build/m2sh
-+all: ../lemon/lemon build/m2sh
-
- dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
- dev: all
-@@ -27,7 +28,7 @@ build/m2sh: ../lemon/lemon ../../build/l
- $(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS)
-
- ../lemon/lemon: ../lemon/lemon.c
-- $(CC) -O2 ../lemon/lemon.c -o ../lemon/lemon
-+ $(CC) $(CFLAGS) ../lemon/lemon.c -o ../lemon/lemon
-
- tests: build/libm2sh.a ${TESTS}
- sh ./tests/runtests.sh
diff --git a/package/mongrel2/patches/patch-tools_procer_Makefile b/package/mongrel2/patches/patch-tools_procer_Makefile
deleted file mode 100644
index 82b0e85e0..000000000
--- a/package/mongrel2/patches/patch-tools_procer_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- mongrel2-v1.11.0.orig/tools/procer/Makefile 2015-12-31 10:25:18.000000000 +0100
-+++ mongrel2-v1.11.0/tools/procer/Makefile 2016-04-25 20:05:39.765826160 +0200
-@@ -1,5 +1,6 @@
--CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
--PREFIX?=/usr/local
-+CFLAGS?=
-+CFLAGS+=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
-+PREFIX?=/usr
- LIBS?=-lzmq
- SOURCES=$(wildcard *.c)
- OBJECTS=$(patsubst %.c,%.o,${SOURCES})