In https://github.com/xaos-project/XaoS/issues/217 I was having a problem with the packaging of x11/XaoS. qmake doesn't define the STRIP variable to /usr/bin/strip but leaves it empty. This of course causes problems when building. I traced the issue to the file /usr/pkg/qt5/mkspecs/netbsd-g++/qmake.conf and it includes include(../common/unix.conf). If I replace that by include(../common/bsd/bsd.conf), then STRIP gets defined (even though the newly included file only references QMAKE_STRIP, but apparently that's good enough. The replacement is safe, since the new file includes the other one. Looking at the source of qmake in qtbase-everywhere-src-5.15.2, we have a file mkspecs/netbsd-g++/qmake.conf which one would think corresponds to the source of the mentioned file. However, it looks quite different, and in particular it does contain the *correct* include. qtbase-everywhere-src-5.15.2/mkspecs/netbsd-g++$ cat qmake.conf # # qmake configuration for netbsd-g++ # MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = netbsd include(../common/bsd/bsd.conf) ... $ head -15 /scratch/chroot/pkg_comp.amd64-9.2/default/usr/pkg/qt5/mkspecs/netbsd-g++/qmake.conf # # qmake configuration for pkgsrc # MAKEFILE_GENERATOR = UNIX CONFIG += qt warn_on release link_prl incremental gdb_dwarf_index QMAKE_INCREMENTAL_STYLE = sublib QMAKE_PLATFORM += netbsd include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) # include(../common/unix.conf) include(../common/bsd/bsd.conf) (yes it is the file I edited as mentioned) Probably this "qmake configuration for pkgsrc" comes from x11/qt5-qtbase/files/qmake.conf? I'd like to patch it (at least) or maybe it should simply even be discarded, and the upstream file should be used. An argument for that is that the pkgsrc-supplied file, with bsd/bsd.conf, would of course be wrong for non-BSDs. For example, solaris-cc/qmake.conf has include(../common/unix.conf) and linux-g++-64/qmake.conf has include(../common/linux.conf). Index: qmake.conf =================================================================== RCS file: /cvsroot/pkgsrc/x11/qt5-qtbase/files/qmake.conf,v retrieving revision 1.10 diff -u -r1.10 qmake.conf --- qmake.conf 9 Aug 2019 17:41:39 -0000 1.10 +++ qmake.conf 27 Jun 2021 17:37:22 -0000 @@ -10,7 +10,7 @@ include(../common/gcc-base-unix.conf) include(../common/g++-unix.conf) -include(../common/unix.conf) +include(../common/bsd/bsd.conf) QMAKE_COMPILER = @COMPILER@ -Olaf. -- ___ Q: "What's an anagram of Banach-Tarski?" -- Olaf "Rhialto" Seibert \X/ A: "Banach-Tarski Banach-Tarski." -- rhialto at falu dot nl
Attachment:
signature.asc
Description: PGP signature