Index | Thread | Search

From:
"Rafael Sadowski via ports" <ports@openbsd.org>
Subject:
Add MODQT_ENV_SETUP to qt5/6
To:
ports <ports@openbsd.org>
Date:
Thu, 14 Mar 2024 21:08:43 +0100

Download raw body.

Thread
  • Rafael Sadowski via ports:

    Add MODQT_ENV_SETUP to qt5/6

Make _MODQT6_SETUP and _MODQT5_SETUP optional. Enabled by default so
that the behavior does not change.

OK?

diff --git a/x11/qt5/qt5.port.mk b/x11/qt5/qt5.port.mk
index 2115f090dfb..7e4ff237d35 100644
--- a/x11/qt5/qt5.port.mk
+++ b/x11/qt5/qt5.port.mk
@@ -163,9 +163,13 @@ LIB_DEPENDS += 		${MODQT5_LIB_DEPENDS}
 BUILD_DEPENDS += 	${MODQT5_BUILD_DEPENDS}
 .endif
 
+MODQT_ENV_SETUP ?=	Yes
+MODQT5_ENV_SETUP ?=	${MODQT_ENV_SETUP}
+.if ${MODQT5_ENV_SETUP:L} == yes
 CONFIGURE_ENV +=${_MODQT5_SETUP}
 MAKE_ENV +=	${_MODQT5_SETUP}
 MAKE_FLAGS +=	${_MODQT5_SETUP}
+.endif
 
 MODQT5_USE_CXX11 ?=	Yes
 .if ${MODQT5_USE_CXX11:L} == "yes"
diff --git a/x11/qt6/qt6.port.mk b/x11/qt6/qt6.port.mk
index 1695454b83e..377ad3ff343 100644
--- a/x11/qt6/qt6.port.mk
+++ b/x11/qt6/qt6.port.mk
@@ -41,9 +41,13 @@ MODQT6_DEPS ?=		${MODQT_DEPS}
 LIB_DEPENDS +=		${MODQT6_LIB_DEPENDS}
 .endif
 
+MODQT_ENV_SETUP ?=	Yes
+MODQT6_ENV_SETUP ?=	${MODQT_ENV_SETUP}
+.if ${MODQT6_ENV_SETUP:L} == yes
 CONFIGURE_ENV +=	${_MODQT6_SETUP}
 MAKE_ENV +=		${_MODQT6_SETUP}
 MAKE_FLAGS +=		${_MODQT6_SETUP}
+.endif
 
 MODQT6_USE_CXX17 ?=	Yes