Attachment #195013 for bug #229657

View | Details | Raw Unified | Return to bug 229657
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +2 lines)
3		3
4	PORTNAME= mongrel2	4	PORTNAME= mongrel2
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 1.11.0	6	DISTVERSION= 1.12.0
7	CATEGORIES= www	7	CATEGORIES= www
8		8
9	MAINTAINER= neel@neelc.org	9	MAINTAINER= neel@neelc.org
Lines 35-40 Link Here
35	tornado \	35	tornado \
36	zcov	36	zcov
37	MAKE_JOBS_UNSAFE= yes	37	MAKE_JOBS_UNSAFE= yes
		38	MAKE_ARGS+= -f localmbedtls.mak
38		39
39	TEST_TARGET= tests # tests fail on 12: Invalid system call	40	TEST_TARGET= tests # tests fail on 12: Invalid system call
40	TEST_ENV= ${MAKE_ENV} OPTFLAGS=-I${LOCALBASE}/include	41	TEST_ENV= ${MAKE_ENV} OPTFLAGS=-I${LOCALBASE}/include

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1520062781	1	TIMESTAMP = 1531175682
2	SHA256 (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = dd7accbe4be25ee841b1d73e1fc2e6230e90f5783e1d25527037416e5f519c86	2	SHA256 (mongrel2-mongrel2-v1.12.0_GH0.tar.gz) = cef8aeaac27ae61d81a5b7bce023aa3cb8e0e50d4a0fbab84738deb488a889f4
3	SIZE (mongrel2-mongrel2-v1.11.0_GH0.tar.gz) = 1060770	3	SIZE (mongrel2-mongrel2-v1.12.0_GH0.tar.gz) = 1065961
4	SHA256 (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = de500973a2db0bc419ddd7a67360b1f2dd4fe925448539f8ee59ae3e6eafcc9b	4	SHA256 (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = de500973a2db0bc419ddd7a67360b1f2dd4fe925448539f8ee59ae3e6eafcc9b
5	SIZE (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = 1803037	5	SIZE (ARMmbed-mbedtls-8254ed2_GH0.tar.gz) = 1803037




--- Makefile.orig	2015-12-31 09:25:07 UTC
+++ Makefile
@@ -1,5 +1,6 @@
-CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
+CFLAGS?=-g -O2
+CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
+LIBS=-L${LOCALBASE}/lib -lzmq -lsqlite3 $(OPTLIBS)
 PREFIX?=/usr/local
 
 get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
@@ -22,14 +23,14 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTF
 #   upon every make invocation, and must be done before the SOURCES variable, above
 #   is lazily evaluated, or none of the src/mbedtls source files will be found
 
-ifdef $($(shell									\
-	if git submodule status | grep '^-'; then				\
-	    echo "mbedtls; init and update git submodule" 1>&2;		\
-	    git submodule init && git submodule update;				\
-	fi ))
-endif
+#ifdef $($(shell									\
+#	if git submodule status | grep '^-'; then				\
+#	    echo "mbedtls; init and update git submodule" 1>&2;		\
+#	    git submodule init && git submodule update;				\
+#	fi ))
+#endif
 
-all: builddirs bin/mongrel2 tests m2sh procer
+all: builddirs bin/mongrel2 filters config_modules m2sh procer
 
 dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
 dev: all
@@ -220,9 +221,9 @@ netbsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS)
 netbsd: dev
 
 
-freebsd: OPTFLAGS += -I/usr/local/include
-freebsd: OPTLIBS += -L/usr/local/lib -pthread
-freebsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS)
+freebsd: OPTFLAGS += -I$(PREFIX)/include
+freebsd: OPTLIBS += -L$(PREFIX)/lib -pthread
+freebsd: LIBS=-L$(PREFIX)/lib -lzmq -lsqlite3 $(OPTLIBS)
 freebsd: all
 
 openbsd: OPTFLAGS += -I/usr/local/include

Return to bug 229657

Lines 1-46 Link Here

(-)files/patch-Makefile (-46 lines)
1	--- Makefile.orig 2015-12-31 09:25:07 UTC
2	+++ Makefile
3	@@ -1,5 +1,6 @@
4	-CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
5	-LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS)
6	+CFLAGS?=-g -O2
7	+CFLAGS+=-Wall -Wextra -Isrc -Isrc/mbedtls/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
8	+LIBS=-L${LOCALBASE}/lib -lzmq -lsqlite3 $(OPTLIBS)
9	PREFIX?=/usr/local
10
11	get_objs = $(addsuffix .o,$(basename $(wildcard $(1))))
12	@@ -22,14 +23,14 @@ MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTF
13	# upon every make invocation, and must be done before the SOURCES variable, above
14	# is lazily evaluated, or none of the src/mbedtls source files will be found
15
16	-ifdef $($(shell \
17	- if git submodule status \| grep '^-'; then \
18	- echo "mbedtls; init and update git submodule" 1>&2; \
19	- git submodule init && git submodule update; \
20	- fi ))
21	-endif
22	+#ifdef $($(shell \
23	+# if git submodule status \| grep '^-'; then \
24	+# echo "mbedtls; init and update git submodule" 1>&2; \
25	+# git submodule init && git submodule update; \
26	+# fi ))
27	+#endif
28
29	-all: builddirs bin/mongrel2 tests m2sh procer
30	+all: builddirs bin/mongrel2 filters config_modules m2sh procer
31
32	dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64
33	dev: all
34	@@ -220,9 +221,9 @@ netbsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS)
35	netbsd: dev
36
37
38	-freebsd: OPTFLAGS += -I/usr/local/include
39	-freebsd: OPTLIBS += -L/usr/local/lib -pthread
40	-freebsd: LIBS=-lzmq -lsqlite3 $(OPTLIBS)
41	+freebsd: OPTFLAGS += -I$(PREFIX)/include
42	+freebsd: OPTLIBS += -L$(PREFIX)/lib -pthread
43	+freebsd: LIBS=-L$(PREFIX)/lib -lzmq -lsqlite3 $(OPTLIBS)
44	freebsd: all
45
46	openbsd: OPTFLAGS += -I/usr/local/include