Attachment #181684 for bug #218562

Lines 3-8 Link Here

(-)graphics/dri/Makefile (+1 lines)
3		3
4	PORTNAME= dri	4	PORTNAME= dri
5	PORTVERSION= ${MESAVERSION}	5	PORTVERSION= ${MESAVERSION}
		6	PORTREVISION= 1
6	PORTEPOCH= 2	7	PORTEPOCH= 2
7	CATEGORIES= graphics	8	CATEGORIES= graphics
8		9

Lines 15-24 post-patch: Link Here

(-)graphics/libGL/Makefile.targets (-4 lines)
15	.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"	15	.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
16	@${REINPLACE_CMD} -e 's\|-DUSE_GCC_ATOMIC_BUILTINS\|\|' ${WRKSRC}/configure	16	@${REINPLACE_CMD} -e 's\|-DUSE_GCC_ATOMIC_BUILTINS\|\|' ${WRKSRC}/configure
17	.endif	17	.endif
18	.else # ${OPSYS} == DragonFly
19	# Sed on dragonfly doesn't support \< or \>
20	@${REINPLACE_CMD} -e 's\|\\>//\|[[:>:]]//\|' \
21	${WRKSRC}/configure
22	.endif # ${OPSYS}	18	.endif # ${OPSYS}
23	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \	19	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \
24	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c	20	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c

Lines 1-9 Link Here

(-)graphics/libGL/files/configure.ac (-12 / +15 lines)
1	--- configure.ac.orig 2017-04-01 15:33:36 UTC	1	--- configure.ac.orig 2017-04-01 15:33:36 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -943,18 +943,19 @@ llvm_add_target() {	3	@@ -942,19 +942,19 @@ llvm_add_target() {
		4	# Call this inside ` ` to get the return value.
4	# $1 is the llvm-config command with arguments.	5	# $1 is the llvm-config command with arguments.
5	strip_unwanted_llvm_flags() {	6	strip_unwanted_llvm_flags() {
6	# Use \> (marks the end of the word)	7	- # Use \> (marks the end of the word)
7	- echo " `$1`" \| sed \	8	- echo " `$1`" \| sed \
8	- -e 's/\s\+-m\S*//g' \	9	- -e 's/\s\+-m\S*//g' \
9	- -e 's/\s\+-DNDEBUG\>//g' \	10	- -e 's/\s\+-DNDEBUG\>//g' \
Lines 12-32 Link Here
12	- -e 's/\s\+-W\S*//g' \	13	- -e 's/\s\+-W\S*//g' \
13	- -e 's/\s\+-O\S*//g' \	14	- -e 's/\s\+-O\S*//g' \
14	- -e 's/\s\+-g\S*//g' \	15	- -e 's/\s\+-g\S*//g' \
15	+ echo " `$1`" \| sed -E \	16	- -e 's/-fno-rtti\>/-Fno-rtti/g' \
		17	- -e 's/\s\+-f\S*//g' \
		18	- -e 's/-Fno-rtti\>/-fno-rtti/g' \
		19	- -e 's/^ //'
		20	+ echo " `$1` " \| sed -E \
16	+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \	21	+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
17	+ -e 's/[[[:space:]]]+-DNDEBUG\>//g' \	22	+ -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
18	+ -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \	23	+ -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
19	+ -e 's/[[[:space:]]]+-pedantic\>//g' \	24	+ -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
20	+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \	25	+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
21	+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \	26	+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
22	+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \	27	+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
23	-e 's/-fno-rtti\>/-Fno-rtti/g' \	28	+ -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
24	- -e 's/\s\+-f\S*//g' \
25	+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \	29	+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
26	-e 's/-Fno-rtti\>/-fno-rtti/g' \	30	+ -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
27	- -e 's/^ //'	31	+ -e 's/^[[[:space:]]]//' \
28	+ -e 's/-fno-exceptions\>//g' \	32	+ -e 's/[[[:space:]]]$//'
29	+ -e 's/^[[[:space:]]]//'
30	}	33	}
31		34
32	llvm_set_environment_variables() {	35	llvm_set_environment_variables() {

Lines 1-9 Link Here

(-)graphics/libGL/files/patch-configure (-15 / +18 lines)
1	--- configure.orig 2017-04-01 15:33:50 UTC	1	--- configure.orig 2017-04-01 15:33:50 UTC
2	+++ configure	2	+++ configure
3	@@ -22351,18 +22351,19 @@ llvm_add_target() {	3	@@ -22350,19 +22307,19 @@ llvm_add_target() {
		4	# Call this inside ` ` to get the return value.
4	# $1 is the llvm-config command with arguments.	5	# $1 is the llvm-config command with arguments.
5	strip_unwanted_llvm_flags() {	6	strip_unwanted_llvm_flags() {
6	# Use \> (marks the end of the word)	7	- # Use \> (marks the end of the word)
7	- echo " `$1`" \| sed \	8	- echo " `$1`" \| sed \
8	- -e 's/\s\+-m\S*//g' \	9	- -e 's/\s\+-m\S*//g' \
9	- -e 's/\s\+-DNDEBUG\>//g' \	10	- -e 's/\s\+-DNDEBUG\>//g' \
Lines 12-32 Link Here
12	- -e 's/\s\+-W\S*//g' \	13	- -e 's/\s\+-W\S*//g' \
13	- -e 's/\s\+-O\S*//g' \	14	- -e 's/\s\+-O\S*//g' \
14	- -e 's/\s\+-g\S*//g' \	15	- -e 's/\s\+-g\S*//g' \
15	+ echo " `$1`" \| sed -E \	16	- -e 's/-fno-rtti\>/-Fno-rtti/g' \
16	+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
17	+ -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
18	+ -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
19	+ -e 's/[[[:space:]]]+-pedantic\>//g' \
20	+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
21	+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
22	+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
23	-e 's/-fno-rtti\>/-Fno-rtti/g' \
24	- -e 's/\s\+-f\S*//g' \	17	- -e 's/\s\+-f\S*//g' \
25	+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \	18	- -e 's/-Fno-rtti\>/-fno-rtti/g' \
26	-e 's/-Fno-rtti\>/-fno-rtti/g' \
27	- -e 's/^ //'	19	- -e 's/^ //'
28	+ -e 's/-fno-exceptions\>//g' \	20	+ echo " `$1` " \| sed -E \
29	+ -e 's/^[[[:space:]]]//'	21	+ -e 's/[[:space:]]+-m[^[:space:]]*//g' \
		22	+ -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \
		23	+ -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \
		24	+ -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \
		25	+ -e 's/[[:space:]]+-W[^[:space:]]*//g' \
		26	+ -e 's/[[:space:]]+-O[^[:space:]]*//g' \
		27	+ -e 's/[[:space:]]+-g[^[:space:]]*//g' \
		28	+ -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \
		29	+ -e 's/[[:space:]]+-f[^[:space:]]*//g' \
		30	+ -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \
		31	+ -e 's/^[[:space:]]//' \
		32	+ -e 's/[[:space:]]$//'
30	}	33	}
31		34
32	llvm_set_environment_variables() {	35	llvm_set_environment_variables() {

Return to bug 218562