Index | Thread | Search

From:
Theo Buehler <tb@theobuehler.org>
Subject:
Re: fix python 3.13 for ports-gcc archs
To:
Claudio Jeker <cjeker@diehard.n-r-g.com>
Cc:
ports@openbsd.org
Date:
Tue, 25 Nov 2025 17:55:08 +0100

Download raw body.

Thread
On Tue, Nov 25, 2025 at 01:49:19PM +0100, Claudio Jeker wrote:
> On Sat, Nov 22, 2025 at 07:55:30PM +0000, Stuart Henderson wrote:
> > for qt5 you have COMPILER_LANGS = c c++, but for qt6 it's COMPILER_LANGS
> > ?= c c++. it needs to use either += or ?= otherwise you lose an existing
> > setting (e.g. COMPILER_LANGS = fortran).
> > 
> > otherwise lgtm.
> > 
> > i can start a bulk on i386 with this tomorrow
> > 
> 
> Here is my latest version of this diff. It includes some more ports that
> have MODULE += lang/python and either miss COMPILER_LANGS or include it
> via another MODULE but that is too late.

The kde stuff is a bit annoying but I guess that isn't easily fixed as
long as the relevant modules are pulled in via Makefile.inc.

I'm ok with this diff (haven't tested), but I'd also be fine with only
landing the initial diff (with the ?= stuff sthen pointed out fixed).

> 
> -- 
> :wq Claudio
> 
> Index: devel/kf5/kfilemetadata/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf5/kfilemetadata/Makefile,v
> diff -u -p -r1.26 Makefile
> --- devel/kf5/kfilemetadata/Makefile	1 Oct 2025 18:53:30 -0000	1.26
> +++ devel/kf5/kfilemetadata/Makefile	24 Nov 2025 16:30:32 -0000
> @@ -20,6 +20,9 @@ WANTLIB-main += exiv2 m poppler poppler-
>  
>  WANTLIB-locale =
>  
> +COMPILER =		base-clang ports-gcc
> +COMPILER_LANGS =	c c++
> +
>  MODULES +=		lang/python
>  # required only for externalextractortest and externalwritertest
>  MODPY_BUILDDEP =	No
> Index: devel/kf6/breeze-icons/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf6/breeze-icons/Makefile,v
> diff -u -p -r1.9 Makefile
> --- devel/kf6/breeze-icons/Makefile	21 Dec 2024 11:39:33 -0000	1.9
> +++ devel/kf6/breeze-icons/Makefile	24 Nov 2025 13:36:12 -0000
> @@ -7,6 +7,9 @@ SHARED_LIBS +=	KF6BreezeIcons           
>  
>  WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Gui m
>  
> +COMPILER =	base-clang ports-gcc
> +COMPILER_LANGS =	c c++
> +
>  MODULES =	lang/python
>  MODPY_RUNDEP =	No
>  
> Index: devel/kf6/kdesu/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf6/kdesu/Makefile,v
> diff -u -p -r1.5 Makefile
> --- devel/kf6/kdesu/Makefile	20 May 2024 06:36:49 -0000	1.5
> +++ devel/kf6/kdesu/Makefile	24 Nov 2025 16:46:31 -0000
> @@ -6,6 +6,9 @@ SHARED_LIBS +=  KF6Su                   
>  WANTLIB += ${COMPILER_LIBCXX} ICE KF6ConfigCore KF6CoreAddons
>  WANTLIB += KF6I18n KF6Pty Qt6Core SM X11 Xext c m
>  
> +COMPILER =	base-clang ports-gcc
> +COMPILER_LANGS=	c c++
> +
>  MODULES +=	lang/python
>  # required only for tests
>  MODPY_BUILDDEP =	Yes
> Index: devel/kf6/kfilemetadata/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf6/kfilemetadata/Makefile,v
> diff -u -p -r1.9 Makefile
> --- devel/kf6/kfilemetadata/Makefile	14 Sep 2025 09:10:44 -0000	1.9
> +++ devel/kf6/kfilemetadata/Makefile	24 Nov 2025 16:48:06 -0000
> @@ -8,6 +8,9 @@ WANTLIB += KF6I18n QMobipocket6 Qt6Core 
>  WANTLIB += avformat avutil c epub exiv2 m poppler poppler-qt6
>  WANTLIB += tag
>  
> +COMPILER =	base-clang ports-gcc
> +COMPILER_LANGS=	c c++
> +
>  MODULES +=	lang/python
>  # required only for externalextractortest and externalwritertest
>  MODPY_BUILDDEP =	No
> Index: devel/kf6/ki18n/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/kf6/ki18n/Makefile,v
> diff -u -p -r1.8 Makefile
> --- devel/kf6/ki18n/Makefile	9 Feb 2025 08:55:34 -0000	1.8
> +++ devel/kf6/ki18n/Makefile	24 Nov 2025 13:36:58 -0000
> @@ -7,6 +7,9 @@ SHARED_LIBS +=  KF6I18nQml              
>  
>  WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Qml intl m
>  
> +COMPILER=	base-clang ports-gcc
> +COMPILER_LANGS=	c c++
> +
>  MODULES +=	lang/python \
>  		textproc/intltool
>  
> Index: devel/py-gobject3/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-gobject3/Makefile,v
> diff -u -p -r1.99 Makefile
> --- devel/py-gobject3/Makefile	10 Nov 2025 05:28:43 -0000	1.99
> +++ devel/py-gobject3/Makefile	20 Nov 2025 14:32:27 -0000
> @@ -17,6 +17,9 @@ PERMIT_PACKAGE=		Yes
>  
>  WANTLIB += cairo cairo-gobject ffi girepository-2.0 glib-2.0 gobject-2.0
>  
> +COMPILER=		base-clang ports-gcc
> +COMPILER_LANGS=		c
> +
>  MODULES=		devel/meson \
>  			lang/python \
>  			x11/gnome
> Index: lang/python/3/python.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/python/3/python.port.mk,v
> diff -u -p -r1.11 python.port.mk
> --- lang/python/3/python.port.mk	14 Nov 2025 08:20:58 -0000	1.11
> +++ lang/python/3/python.port.mk	20 Nov 2025 13:56:01 -0000
> @@ -9,6 +9,9 @@ CATEGORIES +=		lang/python
>  # must be REVISION-bumped.
>  # - Keep xenocara/share/mk/bsd.xorg.mk PYTHON_VERSION in sync.
>  
> +COMPILER ?=		base-clang ports-gcc
> +COMPILER_LANGS ?=	c
> +
>  MODPY_WANTLIB =		python${MODPY_VERSION}
>  MODPY_RUN_DEPENDS =	lang/python/3
>  MODPY_LIB_DEPENDS =	lang/python/3
> Index: textproc/py-cchardet/Makefile
> ===================================================================
> RCS file: /cvs/ports/textproc/py-cchardet/Makefile,v
> diff -u -p -r1.8 Makefile
> --- textproc/py-cchardet/Makefile	29 Apr 2025 10:40:12 -0000	1.8
> +++ textproc/py-cchardet/Makefile	24 Nov 2025 14:56:11 -0000
> @@ -14,6 +14,9 @@ PERMIT_PACKAGE=	Yes
>  
>  WANTLIB += ${COMPILER_LIBCXX} m
>  
> +COMPILER=	base-clang ports-gcc
> +COMPILER_LANGS=	c c++
> +
>  MODULES=	lang/python
>  MODPY_PYBUILD=	setuptools
>  MODPY_PI=	Yes
> Index: x11/kde-applications/kopeninghours/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/kde-applications/kopeninghours/Makefile,v
> diff -u -p -r1.22 Makefile
> --- x11/kde-applications/kopeninghours/Makefile	2 Nov 2025 19:43:58 -0000	1.22
> +++ x11/kde-applications/kopeninghours/Makefile	24 Nov 2025 16:59:51 -0000
> @@ -12,6 +12,9 @@ WANTLIB += boost_graph-mt boost_python${
>  
>  MODKDE_TRANSLATIONS = yes
>  
> +COMPILER =	base-clang ports-gcc
> +COMPILER_LANGS=	c c++
> +
>  MODULES +=	lang/python
>  
>  BUILD_DEPENDS =	devel/bison
> Index: x11/py-sip-qt6/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/py-sip-qt6/Makefile,v
> diff -u -p -r1.5 Makefile
> --- x11/py-sip-qt6/Makefile	29 Apr 2025 10:40:38 -0000	1.5
> +++ x11/py-sip-qt6/Makefile	19 Nov 2025 19:24:48 -0000
> @@ -13,6 +13,9 @@ HOMEPAGE=	https://www.riverbankcomputing
>  # SIP license (Python-like) or GPLv2/v3
>  PERMIT_PACKAGE=	Yes
>  
> +COMPILER=	base-clang ports-gcc
> +COMPILER_LANGS=	c
> +
>  MODULES=	lang/python
>  
>  MODPY_PI=	Yes
> Index: x11/qt5/qt5.port.mk
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qt5.port.mk,v
> diff -u -p -r1.33 qt5.port.mk
> --- x11/qt5/qt5.port.mk	23 Mar 2024 06:54:27 -0000	1.33
> +++ x11/qt5/qt5.port.mk	24 Nov 2025 13:39:39 -0000
> @@ -174,6 +174,7 @@ MAKE_FLAGS +=	${_MODQT5_SETUP}
>  MODQT5_USE_CXX11 ?=	Yes
>  .if ${MODQT5_USE_CXX11:L} == "yes"
>  COMPILER ?= base-clang ports-gcc
> +COMPILER_LANGS ?= c c++
>  ONLY_FOR_ARCHS ?= ${CXX11_ARCHS}
>  # useful?
>  _MODQT5_SETUP +=	CC=${CC} CXX=${CXX}
> Index: x11/qt5/qttranslations/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qttranslations/Makefile,v
> diff -u -p -r1.9 Makefile
> --- x11/qt5/qttranslations/Makefile	12 Nov 2023 07:07:21 -0000	1.9
> +++ x11/qt5/qttranslations/Makefile	24 Nov 2025 19:22:04 -0000
> @@ -5,6 +5,8 @@ RUN_DEPENDS =	x11/qt5/qtbase>=${QT5_VERS
>  BUILD_DEPENDS =	x11/qt5/qtbase>=${QT5_VERSION},<${QT5_NEXT_VERSION} \
>  		x11/qt5/qttools>=${QT5_VERSION},<${QT5_NEXT_VERSION}
>  
> +COMPILER =			base-clang ports-gcc
> +
>  MODQT5_DEPS =			no
>  MODQT5_USE_CXX11 =		No
>  NO_CCACHE =			Yes
> Index: x11/qt6/qt6.port.mk
> ===================================================================
> RCS file: /cvs/ports/x11/qt6/qt6.port.mk,v
> diff -u -p -r1.13 qt6.port.mk
> --- x11/qt6/qt6.port.mk	10 Aug 2025 05:30:00 -0000	1.13
> +++ x11/qt6/qt6.port.mk	20 Nov 2025 22:01:59 -0000
> @@ -58,6 +58,7 @@ MODQT6_USE_CXX17 ?=	Yes
>  
>  .if ${MODQT6_USE_CXX17:L} == "yes"
>  COMPILER ?= base-clang ports-gcc
> +COMPILER_LANGS ?= c c++
>  ONLY_FOR_ARCHS ?= ${CXX11_ARCHS}
>  .endif
>