qt(59|511|513|5|6)-qtlocation: conflicts_build boost

[skip ci]
macports · Jul 24, 2022 · 9761ed7 · 9761ed7
1 parent 0a6c222
commit 9761ed7
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
@@ -1567,6 +1567,11 @@ foreach {module module_info} [array get modules] {
 
             # special case
             if { ${module} eq "qtlocation" } {
+                PortGroup       conflicts_build 1.0
+
+                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
+                conflicts_build boost
+
                 # qtlocation uses
                 #    Gypsy (https://gypsy.freedesktop.org/wiki/)
                 #    if they can be found

diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
@@ -1375,6 +1375,11 @@ foreach {module module_info} [array get modules] {
 
             # special case
             if { ${module} eq "qtlocation" } {
+                PortGroup       conflicts_build 1.0
+
+                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
+                conflicts_build boost
+
                 # qtlocation uses
                 #    Gypsy (https://gypsy.freedesktop.org/wiki/)
                 #    if they can be found

diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
@@ -1392,6 +1392,11 @@ foreach {module module_info} [array get modules] {
 
             # special case
             if { ${module} eq "qtlocation" } {
+                PortGroup       conflicts_build 1.0
+
+                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
+                conflicts_build boost
+
                 # qtlocation uses
                 #    Gypsy (https://gypsy.freedesktop.org/wiki/)
                 #    if they can be found

diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
@@ -1361,6 +1361,12 @@ foreach {module module_info} [array get modules] {
 
             # special case
             if { ${module} eq "qtlocation" } {
+                PortGroup       conflicts_build 1.0
+
+                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
+                #   error: expected ';' at end of declaration list
+                conflicts_build boost
+
                 # qtlocation uses
                 #    Gypsy (https://gypsy.freedesktop.org/wiki/)
                 #    if they can be found

diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
@@ -1023,7 +1023,14 @@ foreach {module module_info} [array get modules] {
             ###############################################################################
             # Special Cases
             ###############################################################################
-
+
+            # special case
+            if { ${module} eq "qtlocation" } {
+                PortGroup       conflicts_build 1.0
+
+                # do not allow ${prefix}/include/boost to conflict with bundled boost (in bundled mapbox-gl-native)
+                conflicts_build boost
+            }
         }
     }
 }