Attachment #210943 for bug #243498

Lines 2-10 Link Here

(-)devel/godot2/Makefile (-3 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= godot	4	PORTNAME= godot
5	PORTVERSION= 2.1.5	5	PORTVERSION= 2.1.6
6	DISTVERSIONSUFFIX= -stable	6	DISTVERSIONSUFFIX= -stable
7	PORTREVISION= 3
8	CATEGORIES= devel games	7	CATEGORIES= devel games
9	PKGNAMESUFFIX?= 2	8	PKGNAMESUFFIX?= 2
10		9
Lines 37-42 Link Here
37	CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED	36	CXXFLAGS+= -DGLEW_NO_GLU -DRTAUDIO_ENABLED
38	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}	37	CXXFLAGS_i386= ${CXXFLAGS_i386_${CHOSEN_COMPILER_TYPE}}
39	CXXFLAGS_i386_gcc= -march=i586	38	CXXFLAGS_i386_gcc= -march=i586
		39	CXXFLAGS_aarch64= -DNO_THREADS
		40	CXXFLAGS_sparc64= -DNO_THREADS
		41	CXXFLAGS_mips= -DNO_THREADS
		42	CXXFLAGS_mips64= -DNO_THREADS
40	LDFLAGS+= -lspeex -lmpcdec	43	LDFLAGS+= -lspeex -lmpcdec
41		44
42	OPTIONS_DEFINE= EXAMPLES TOOLS	45	OPTIONS_DEFINE= EXAMPLES TOOLS
Lines 74-79 Link Here
74	.MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=	77	.MAKEFLAGS: WITH="${OPTIONS_DEFINE}" OPTIONS_EXCLUDE=
75	.endif	78	.endif
76		79
		80	.include <bsd.port.pre.mk>
		81
		82	.if ${ARCH} != amd64 && ${ARCH} != i386
		83	# use system libvpx for non-x86 platforms
		84	# the internal copy is patched for x86
		85	LIB_DEPENDS+= libvpx.so:multimedia/libvpx
		86	MAKE_ARGS+= builtin_libvpx=False
		87	.endif
		88
77	post-patch:	89	post-patch:
78	@${REINPLACE_CMD} -e 's\|custom_build\|${OPSYS}_Ports_build\|' \	90	@${REINPLACE_CMD} -e 's\|custom_build\|${OPSYS}_Ports_build\|' \
79	${WRKSRC}/methods.py	91	${WRKSRC}/methods.py
Lines 97-100 Link Here
97	${INSTALL_DATA} ${WRKSRC}/icon.svg \	109	${INSTALL_DATA} ${WRKSRC}/icon.svg \
98	${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg	110	${STAGEDIR}${PREFIX}/share/pixmaps/${GODOTFILE}.svg
99		111
100	.include <bsd.port.mk>	112	.include <bsd.port.post.mk>

Lines 1-5 Link Here

(-)devel/godot2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1536385697	1	TIMESTAMP = 1579663149
2	SHA256 (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 74179c08bcc20cc89b4ac2785a31f201d81eb4aa875c80ffcb82d9fb80e8e187	2	SHA256 (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 5bfc57f2ee24dccfdcefe491a3be1a07b39299f2fcfa03202b8b4c6c2dd5122b
3	SIZE (godotengine-godot-2.1.5-stable_GH0.tar.gz) = 15026226	3	SIZE (godotengine-godot-2.1.6-stable_GH0.tar.gz) = 15043275
4	SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75	4	SHA256 (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = f474381ba834d37cfce45c0130dad16d907a4ce28cde94f35c7d96a72f164d75
5	SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045	5	SIZE (godotengine-godot-demo-projects-2.1.4-stable_GH0.tar.gz) = 20534045




-    CFLAGS = env.get('CFLAGS', '')
-    env['CFLAGS'] = ''
-
-    env.Append(CFLAGS=str(CFLAGS).split())
+    env['CC'] = os.environ['CC']
+    env['CXX'] = os.environ['CXX']
+    
+    CFLAGS = os.environ['CFLAGS']
+    env['CFLAGS'] = []
     env.Append(CFLAGS=str(CFLAGS).split())
+    
+    CCFLAGS = os.environ['CXXFLAGS']
+    env['CCFLAGS'] = []
+    env.Append(CCFLAGS=str(CCFLAGS).split())
 
     LINKFLAGS = env.get('LINKFLAGS', '')
     env['LINKFLAGS'] = ''

Return to bug 243498

Lines 21-37 Link Here

(-)devel/godot2/files/patch-SConstruct (-3 / +2 lines)
21	- CFLAGS = env.get('CFLAGS', '')	21	- CFLAGS = env.get('CFLAGS', '')
22	- env['CFLAGS'] = ''	22	- env['CFLAGS'] = ''
23	-	23	-
24	- env.Append(CFLAGS=str(CFLAGS).split())
25	+ env['CC'] = os.environ['CC']	24	+ env['CC'] = os.environ['CC']
26	+ env['CXX'] = os.environ['CXX']	25	+ env['CXX'] = os.environ['CXX']
27	+	26	+
28	+ CFLAGS = os.environ['CFLAGS']	27	+ CFLAGS = os.environ['CFLAGS']
29	+ env['CFLAGS'] = []	28	+ env['CFLAGS'] = []
30	+ env.Append(CFLAGS=string.split(str(CFLAGS)))	29	env.Append(CFLAGS=str(CFLAGS).split())
31	+	30	+
32	+ CCFLAGS = os.environ['CXXFLAGS']	31	+ CCFLAGS = os.environ['CXXFLAGS']
33	+ env['CCFLAGS'] = []	32	+ env['CCFLAGS'] = []
34	+ env.Append(CCFLAGS=string.split(str(CCFLAGS)))	33	+ env.Append(CCFLAGS=str(CCFLAGS).split())
35		34
36	LINKFLAGS = env.get('LINKFLAGS', '')	35	LINKFLAGS = env.get('LINKFLAGS', '')
37	env['LINKFLAGS'] = ''	36	env['LINKFLAGS'] = ''