Skip to content

Commit 32fd667

Browse files
committed
glib2-devel: Default to +quartz when -x11 is given
When building pango -x11 in a clean prefix, glib2 will fail to install, because the -x11 variant is being passed down to glib2, but glib2 requires either +quartz or +x11, and +quartz was not enabled by default when x11 was disabled. This caused problems when implementing variant support for the buildbot in macports/mpbb#5 and initially caused me to think that I would have to revert macports/mpbb@f6e4681 which was added due to macports/mpbb#4 and https://lists.macports.org/pipermail/macports-dev/2017-June/035978.html. This solution should instead work without the revert and still allow the buildbot to build both wine and +quartz-x11 ports. See: https://trac.macports.org/ticket/52742
1 parent db34cfa commit 32fd667

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

devel/glib2-devel/Portfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ variant x11 conflicts quartz {
134134
if {![variant_isset quartz]} {
135135
default_variants +x11
136136
}
137-
137+
if {![variant_isset x11]} {
138+
default_variants +quartz
139+
}
138140
if {![variant_isset quartz] && ![variant_isset x11]} {
139141
pre-configure {
140142
return -code error "Either +x11 or +quartz is required"

0 commit comments

Comments
 (0)