Page MenuHomeFreeBSD

Change the way the pkgconfig-file install path is set for Qt5 ports
ClosedPublic

Authored by tcberner on Dec 4 2016, 9:41 PM.

Details

Summary

As noticed in x11-toolkits/qt5-charts we never corrected the way in which qmake sets the pkgconfig path for Qt5-modules. Instead there was a sed-call on the generated Makefiles in bsd.qt.mk in the target qt-pre-install.

This diff modifies devel/qmake5 to set QMAKE_PKGCONFIG_DESTDIR to ../libdata/pkgconfig from the default pkgconfig.

As we split Qt-base into multiple ports, simply patching devel/qmake5 is not enough, as the other base-ports will use the file from inside the tarball. Therefore add it as an extrapatch for the Qt-base ports.
As this affects the same file extrapatch-libtool in devel/qt5 touched, rename this one and add a hunk to do this change too.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

tcberner updated this revision to Diff 22708.Dec 4 2016, 9:41 PM
tcberner retitled this revision from to Change the way the pkgconfig-file install path is set for Qt5 ports.
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added reviewers: kde, rakuco, mat, adridg.
rakuco accepted this revision.Dec 18 2016, 3:30 PM
rakuco edited edge metadata.

lgtm!

This revision was automatically updated to reflect the committed changes.