Date: Sun, 30 Apr 2023 21:04:17 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 00c46f9fe703 - main - devel/qt5-qmake: do not try to install qtconfig header Message-ID: <202304302104.33UL4HfK074932@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=00c46f9fe7030e70c10ea2f69714c0b70b03a175 commit 00c46f9fe7030e70c10ea2f69714c0b70b03a175 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2023-04-28 21:55:35 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2023-04-30 21:04:15 +0000 devel/qt5-qmake: do not try to install qtconfig header Qt-dist ports that are a module need to install their header to qt-config.h. This accidentally happens to qt5-qmake as well. This is only visible when *installing* qt5-qmake on an otherwise fresh system with no other Qt packages. If you install any other Qt packages, then the qt-config header is there for the post-install script to work on (though it doesn't do anything for qt5-qmake). In a clean system, the script fails. PR: 269232 Reported by: Zsolt Udvari --- Mk/Uses/qt-dist.mk | 4 ++++ devel/qt5-qmake/Makefile | 1 + 2 files changed, 5 insertions(+) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index de81ae118073..b000cd2b038b 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -457,7 +457,11 @@ _sub_need_clean= . else _sub_need_clean= \#\# . endif +# The Qt modules have an install- and deinstall-step for wrangling +# the qconfig-modules.h header, but qmake does not. +. if ${PORTNAME} != "qmake" post-install: qt-post-install +. endif # PORTNAME != qmake qt-post-install: # We can't use SUB_FILES with the shared pkg-change.in. # We need it to be a script instead of a group of @unexecs. diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 147f7b17cb93..548114ce4014 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,5 +1,6 @@ PORTNAME= qmake PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304302104.33UL4HfK074932>