View | Details | Raw Unified | Return to bug 218562 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/dri/Makefile (+1 lines)
Lines 3-8 Link Here
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
(-)graphics/libGL/files/configure.ac (-2 / +1 lines)
Lines 1-6 Link Here
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
@@ -943,18 +943,18 @@ llvm_add_target() {
4
 # $1 is the llvm-config command with arguments.
4
 # $1 is the llvm-config command with arguments.
5
 strip_unwanted_llvm_flags() {
5
 strip_unwanted_llvm_flags() {
6
     # Use \> (marks the end of the word)
6
     # Use \> (marks the end of the word)
Lines 25-31 Link Here
25
+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
25
+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
26
         -e 's/-Fno-rtti\>/-fno-rtti/g' \
26
         -e 's/-Fno-rtti\>/-fno-rtti/g' \
27
-        -e 's/^ //'
27
-        -e 's/^ //'
28
+        -e 's/-fno-exceptions\>//g' \
29
+        -e 's/^[[[:space:]]]//'
28
+        -e 's/^[[[:space:]]]//'
30
 }
29
 }
31
 
30
 
(-)graphics/libGL/files/patch-configure (-11 / +10 lines)
Lines 1-6 Link Here
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
@@ -22307,18 +22307,18 @@ llvm_add_target() {
4
 # $1 is the llvm-config command with arguments.
4
 # $1 is the llvm-config command with arguments.
5
 strip_unwanted_llvm_flags() {
5
 strip_unwanted_llvm_flags() {
6
     # Use \> (marks the end of the word)
6
     # Use \> (marks the end of the word)
Lines 13-32 Link Here
13
-        -e 's/\s\+-O\S*//g' \
15
-        -e 's/\s\+-O\S*//g' \
14
-        -e 's/\s\+-g\S*//g' \
16
-        -e 's/\s\+-g\S*//g' \
15
+    echo " `$1`" | sed -E \
17
+    echo " `$1`" | sed -E \
16
+        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
18
+        -e 's/[[:space:]]+-m[^[:space:]]*//g' \
17
+        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
19
+        -e 's/[[:space:]]+-DNDEBUG\>//g' \
18
+        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
20
+        -e 's/[[:space:]]+-D_GNU_SOURCE\>//g' \
19
+        -e 's/[[[:space:]]]+-pedantic\>//g' \
21
+        -e 's/[[:space:]]+-pedantic\>//g' \
20
+        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
22
+        -e 's/[[:space:]]+-W[^[:space:]]*//g' \
21
+        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
23
+        -e 's/[[:space:]]+-O[^[:space:]]*//g' \
22
+        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
24
+        -e 's/[[:space:]]+-g[^[:space:]]*//g' \
23
         -e 's/-fno-rtti\>/-Fno-rtti/g' \
25
         -e 's/-fno-rtti\>/-Fno-rtti/g' \
24
-        -e 's/\s\+-f\S*//g' \
26
-        -e 's/\s\+-f\S*//g' \
25
+        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
27
+        -e 's/[[:space:]]+-f[^[:space:]]*//g' \
26
         -e 's/-Fno-rtti\>/-fno-rtti/g' \
28
         -e 's/-Fno-rtti\>/-fno-rtti/g' \
27
-        -e 's/^ //'
29
-        -e 's/^ //'
28
+        -e 's/-fno-exceptions\>//g' \
30
+        -e 's/^[[:space:]]//'
29
+        -e 's/^[[[:space:]]]//'
30
 }
31
 }
31
 
32
 
32
 llvm_set_environment_variables() {
33
 llvm_set_environment_variables() {

Return to bug 218562