Page MenuHomeFreeBSD
Differential D21735

www/gohugo: Update for D21730
ClosedPublic
Actions

Authored by dmgk on Sep 21 2019, 12:22 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 8:28 AM
Unknown Object (File)
Mon, Apr 14, 3:43 AM
Unknown Object (File)
Sun, Apr 13, 10:47 PM
Unknown Object (File)
Sun, Apr 13, 10:46 PM
Unknown Object (File)
Sun, Apr 13, 10:26 PM
Unknown Object (File)
Sun, Apr 13, 8:59 PM
Unknown Object (File)
Sat, Apr 12, 3:42 PM
Unknown Object (File)
Mar 19 2025, 3:51 AM
View All 88 Files
Subscribers
mat

Details

Reviewers
tz
araujo
tobik
Commits
rP512675: Include bsd.port.pre.mk to get DISTINFO_FILE in scope for the shell command.
Summary

www/gohugo: Update for D21730

Include bsd.port.pre.mk to get DISTINFO_FILE in scope for the shell command.

Test Plan

poudriere testport: OK (120a)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 26646
Build 25020: arc lint + arc unit

Event Timeline

dmgk created this revision.Sep 21 2019, 12:22 PM
Herald added a subscriber: mat. · View Herald TranscriptSep 21 2019, 12:22 PM
Harbormaster completed remote builds in B26596: Diff 62374.Sep 21 2019, 12:22 PM
dmgk mentioned this in D21730: Mk/Uses/go.mk: Omit symbol table and debug information by default.Sep 21 2019, 12:28 PM
tobik accepted this revision.Sep 23 2019, 5:03 AM
tobik added inline comments.
www/gohugo/Makefile
129–131

I think this could use a short comment in the Makefile as to why it is after bsd.port.pre.mk.

I am not a big fan of grabbing TIMESTAMP from distinfo for this. I think the port should just set BuildDate to some static date that never changes. Recording the build date does not seem very important for the port and just makes it more complicated.

This revision is now accepted and ready to land.Sep 23 2019, 5:03 AM
dmgk updated this revision to Diff 62462.Sep 23 2019, 1:11 PM

Add Makefile comment on why bsd.port.pre.mk is needed.

This revision now requires review to proceed.Sep 23 2019, 1:11 PM
Harbormaster completed remote builds in B26646: Diff 62462.Sep 23 2019, 1:11 PM
dmgk marked an inline comment as done.Sep 23 2019, 1:11 PM
dmgk updated this revision to Diff 62464.Sep 23 2019, 1:13 PM

Shorten.

Harbormaster completed remote builds in B26647: Diff 62464.Sep 23 2019, 1:13 PM
tobik accepted this revision.Sep 23 2019, 4:01 PM
This revision is now accepted and ready to land.Sep 23 2019, 4:01 PM
araujo accepted this revision.Sep 23 2019, 7:58 PM
Closed by commit rP512675: Include bsd.port.pre.mk to get DISTINFO_FILE in scope for the shell command. (authored by dmgk). · Explain WhySep 23 2019, 8:42 PM
This revision was automatically updated to reflect the committed changes.
dmgk added a commit: rP512675: Include bsd.port.pre.mk to get DISTINFO_FILE in scope for the shell command..

Revision Contents
Changeset List

PathSize
www/
gohugo/
11 lines

Diff 62462

View Options

www/gohugo/Makefile

Show All 21 Lines
.if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) .if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
Qt_Include_MAINTAINER= kde@FreeBSD.org Qt_Include_MAINTAINER= kde@FreeBSD.org
Qt_Pre_Include= bsd.qt.mk Qt_Pre_Include= bsd.qt.mk
# Qt versions currently supported by the framework. # Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5 _QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.7 QT4_VERSION?= 4.8.7
QT5_VERSION?= 5.6.2 QT5_VERSION?= 5.7.1
_QT_RELNAME= qt${_QT_VERSION:R:R} _QT_RELNAME= qt${_QT_VERSION:R:R}
_QT_VERSION= # empty _QT_VERSION= # empty
.for ver in ${_QT_SUPPORTED} .for ver in ${_QT_SUPPORTED}
. if defined(USE_QT${ver}) . if defined(USE_QT${ver})
. if empty(_QT_VERSION) . if empty(_QT_VERSION)
_QT_VERSION= ${QT${ver}_VERSION} _QT_VERSION= ${QT${ver}_VERSION}
. else . else
# Reject different USE_QT*. # Reject different USE_QT*.
IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #' IGNORE?= can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
. endif . endif
. endif . endif
.endfor .endfor
.if empty(_QT_VERSION) .if empty(_QT_VERSION)
# The file was included without USE_QT*. # The file was included without USE_QT*.
IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #' IGNORE?= can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
.endif .endif
.if defined(QT_DIST) .if defined(QT_DIST)
QT_NONSTANDARD= yes QT_NONSTANDARD= yes
MASTER_SITES= ${MASTER_SITE_QT} MASTER_SITES= ${MASTER_SITE_QT}
# Useless, as it must be defined before including bsd.port.pre.mk (at least
# because of bsd.options.mk).
#PKGNAMEPREFIX?= ${_QT_RELNAME}-
DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo DISTINFO_FILE?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo
LICENSE?= LGPL21 LICENSE?= LGPL21
. if !exists(${PKGDIR}/pkg-descr) . if !exists(${PKGDIR}/pkg-descr)
DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr DESCR?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr
. endif . endif
Show All 21 Lines
# better not to fix what is not explicitly broken there. # better not to fix what is not explicitly broken there.
LDFLAGS+= -Wl,--as-needed LDFLAGS+= -Wl,--as-needed
. if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \ . if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
defined(DISABLE_SIZE) && defined(NO_CHECKSUM) defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
# Ensure that the "makesum" target (with its inner "fetch" one) uses # Ensure that the "makesum" target (with its inner "fetch" one) uses
# devel/qt*/distinfo for every port. # devel/qt*/distinfo for every port.
. if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME} . if ${DISTINFO_FILE:H} == ${.CURDIR:H:H}/devel/${_QT_RELNAME}
QT_DIST= 3d base canvas3d connectivity declarative graphicaleffects imageformats \ QT_DIST= 3d base canvas3d charts connectivity datavis3d declarative \
location multimedia quickcontrols quickcontrols2 script sensors serialbus serialport svg tools \ declarative-render2d gamepad graphicaleffects imageformats \
translations webchannel websockets x11extras xmlpatterns location multimedia quickcontrols quickcontrols2 script scxml \
sensors serialbus serialport svg tools translations \
virtualkeyboard webchannel webkit websockets x11extras \
xmlpatterns
. endif . endif
matUnsubmitted
Done
Inline Actions

i think there is a level of indentation missing here in all but the first line.

mat: i think there is a level of indentation missing here in all but the first line.
matUnsubmitted
Not Done
Inline Actions

These seem to be overwrapped, as if your tabs were 8 spaces wide and not 4.

mat: These seem to be overwrapped, as if your tabs were 8 spaces wide and not 4.
. endif . endif
. if ${QT_DIST} == "base" && ${PORTNAME} != "qmake" . if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
# Qt configure requires pkg-config to detect dependencies. # Qt configure requires pkg-config to detect dependencies.
USES+= pkgconfig USES+= pkgconfig
# Set QMAKESPEC when building qtbase so that qmake (called by the configure # Set QMAKESPEC when building qtbase so that qmake (called by the configure
# script) can find the mkspecs we create ourselves in devel/qmake5. # script) can find the mkspecs we create ourselves in devel/qmake5.
Show All 36 LinesCONFIGURE_ARGS+=-nomake examples -nomake tests \
-archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \ -archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
-libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \ -libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
-qmldir ${PREFIX}/${QT_QMLDIR_REL} \ -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \ -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
-testsdir ${PREFIX}/${QT_TESTDIR_REL} -testsdir ${PREFIX}/${QT_TESTDIR_REL}
. if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2) . if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
CONFIGURE_ARGS+=-no-sse2 CONFIGURE_ARGS+=-no-sse2
. endif . endif
. endif . endif
rakucoUnsubmitted
Done
Inline Actions

Can you add a bigger description of why we do this?

rakuco: Can you add a bigger description of why we do this?
. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG) . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
WITH_DEBUG= yes WITH_DEBUG= yes
STRIP= # It's done prior to bsd.qt.mk inclusion. STRIP= # It's done prior to bsd.qt.mk inclusion.
CONFIGURE_ARGS+=-debug -separate-debug-info CONFIGURE_ARGS+=-debug -separate-debug-info
# Override configuration in global qconfig.pri. # Override configuration in global qconfig.pri.
QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \ QMAKE_ARGS+= QT_CONFIG+="debug separate_debug_info" \
QT_CONFIG-="release" QT_CONFIG-="release"
Show All 9 Lines
CONFIGURE_ARGS+=-verbose CONFIGURE_ARGS+=-verbose
. endif . endif
. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
. if ${_QT_VERSION:M4*} . if ${_QT_VERSION:M4*}
_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
. else . else
_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \ _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
. endif . endif
EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5} ${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
. endif . endif
# Override settings installed in qconfig.h and *.pri files. The flags will be # Override settings installed in qconfig.h and *.pri files. The flags will be
Show All 15 Lines
. endif . endif
. if ${QT_CONFIG:N-*} . if ${QT_CONFIG:N-*}
QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}" QMAKE_ARGS+= QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
. endif . endif
. if ${QT_CONFIG:M-*} . if ${QT_CONFIG:M-*}
QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}" QMAKE_ARGS+= QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
. endif . endif
# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
# The binaries of both supported Qt versions are installed to
# ${LOCALBASE}/lib/qt[45]/bin. The port misc/qtchooser installs
# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
# one depending on the value of QT_SELECT (which we pass to both
# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
# RUN_DEPEND on it.
RUN_DEPENDS+= qtchooser:misc/qtchooser
PLIST_SUB+= SHORTVER=${DISTVERSION:R} \ PLIST_SUB+= SHORTVER=${DISTVERSION:R} \
FULLVER=${DISTVERSION:C/-.*//} FULLVER=${DISTVERSION:C/-.*//}
.endif # defined(QT_DIST) .endif # defined(QT_DIST)
.if ${_QT_VERSION:M4*}
QT_BINDIR_REL?= bin
QT_LIBDIR_REL?= lib/${_QT_RELNAME}
QT_PLUGINDIR_REL?= ${QT_LIBDIR_REL}/plugins
QT_IMPORTDIR_REL?= ${QT_LIBDIR_REL}/imports
.endif
# A wrapper (qtchooser) is used to invoke binaries. # A wrapper (qtchooser) is used to invoke binaries.
QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin QT_BINDIR_REL?= ${QT_ARCHDIR_REL}/bin
QT_INCDIR_REL?= include/${_QT_RELNAME} QT_INCDIR_REL?= include/${_QT_RELNAME}
QT_LIBDIR_REL?= lib QT_LIBDIR_REL?= lib/${_QT_RELNAME}
QT_ARCHDIR_REL?=${QT_LIBDIR_REL}/${_QT_RELNAME} QT_ARCHDIR_REL?=${QT_LIBDIR_REL}
QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins QT_PLUGINDIR_REL?= ${QT_ARCHDIR_REL}/plugins
QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME} QT_LIBEXECDIR_REL?= libexec/${_QT_RELNAME}
QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports QT_IMPORTDIR_REL?= ${QT_ARCHDIR_REL}/imports
QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml QT_QMLDIR_REL?= ${QT_ARCHDIR_REL}/qml
QT_DATADIR_REL?=share/${_QT_RELNAME} QT_DATADIR_REL?=share/${_QT_RELNAME}
QT_DOCDIR_REL?= share/doc/${_QT_RELNAME} QT_DOCDIR_REL?= share/doc/${_QT_RELNAME}
QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations
QT_ETCDIR_REL?= etc/xdg QT_ETCDIR_REL?= etc/xdg
QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME} QT_EXAMPLEDIR_REL?= share/examples/${_QT_RELNAME}
QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests
QT_CMAKEDIR_REL?= lib/cmake
QT_QTCHOOSERDIR_REL?= ${QT_ETCDIR_REL}/qtchooser
# Not customizable. # Not customizable.
.if ${_QT_VERSION:M4*} .if ${_QT_VERSION:M4*}
QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs QT_MKSPECDIR_REL= ${QT_DATADIR_REL}/mkspecs
_QT_LIBVER= # empty _QT_LIBVER= # empty
_QT_BINSUFX= -${_QT_RELNAME}
.else .else
QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs QT_MKSPECDIR_REL= ${QT_ARCHDIR_REL}/mkspecs
_QT_LIBVER= ${_QT_VERSION:R:R} _QT_LIBVER= ${_QT_VERSION:R:R}
_QT_BINSUFX= # empty
.endif .endif
LRELEASE?= ${QT_BINDIR}/lrelease${_QT_BINSUFX} LRELEASE?= ${QT_BINDIR}/lrelease
LUPDATE?= ${QT_BINDIR}/lupdate${_QT_BINSUFX} LUPDATE?= ${QT_BINDIR}/lupdate
MOC?= ${QT_BINDIR}/moc${_QT_BINSUFX} MOC?= ${QT_BINDIR}/moc
RCC?= ${QT_BINDIR}/rcc RCC?= ${QT_BINDIR}/rcc
UIC?= ${QT_BINDIR}/uic${_QT_BINSUFX} UIC?= ${QT_BINDIR}/uic
QMAKE?= ${QT_BINDIR}/qmake${_QT_BINSUFX} QMAKE?= ${QT_BINDIR}/qmake
# Needed to redefine the qmake target for internal Qt configuration. # Needed to redefine the qmake target for internal Qt configuration.
matUnsubmitted
Not Done
Inline Actions

If these are the ones created by qtchooser in PREFIX/bin, it should be PREFIX/bin, not QT_BINDIR. (If they are the ones in PREFIX/some-qt-directory then it's ok.)

mat: If these are the ones created by qtchooser in PREFIX/bin, it should be PREFIX/bin, not…
tcbernerAuthorUnsubmitted
Not Done
Inline Actions

These are the real binaries, i.e. /usr/local/lib/qt4/bin/lrelease .

tcberner: These are the real binaries, i.e. `/usr/local/lib/qt4/bin/lrelease` .
_QMAKE?= ${QMAKE} _QMAKE?= ${QMAKE}
QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER} QMAKESPEC?= ${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER}
# The whole Qt distribution should be built with the same compiler, but it's # The whole Qt distribution should be built with the same compiler, but it's
# better to support custom settings. Dereferencing the detection allows to # better to support custom settings. Dereferencing the detection allows to
# avoid forking a shell on each inclusion of this file, and to catch any CXX # avoid forking a shell on each inclusion of this file, and to catch any CXX
# customization (via USE_GCC, etc.). # customization (via USE_GCC, etc.).
QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac) QMAKE_COMPILER= $$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
# Import QMAKE_ENV and QMAKE_ARGS definitions. # Import QMAKE_ENV and QMAKE_ARGS definitions.
USES+= qmake:_env USES+= qmake:_env
.for dir in INC ARCH PLUGIN LIBEXEC IMPORT \ .for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
CMAKE QTCHOOSER
QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL} QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
# Export all directories to the plist substituion for QT_DIST ports.
rakucoUnsubmitted
Done
Inline Actions

Very small nitpick: there are two spaces instead of one after the '#'s, and an extra space before "QT_DIST".
Additionally, the comment is basically describing what we can see below, it'd be more helpful if it explained why instead.

rakuco: Very small nitpick: there are two spaces instead of one after the '#'s, and an extra space…
# For the others, exclude QT_CMAKEDIR and QT_ETCDIR.
. if (${dir:NCMAKE} && ${dir:NETC}) || defined(QT_DIST)
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
.endfor
.for dir in BIN LIB
QT_${dir}DIR= ${PREFIX}/${QT_${dir}DIR_REL}
. if defined(QT_DIST)
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
. endif . endif
.endfor .endfor
# Pass the chosen Qt version to the environment for qtchooser
rakucoUnsubmitted
Done
Inline Actions

Another small style nitpick: "qt" should be "Qt", and it's always good to end the sentences with a period.

rakuco: Another small style nitpick: "qt" should be "Qt", and it's always good to end the sentences…
CONFIGURE_ENV+= QT_SELECT=${_QT_RELNAME}
MAKE_ENV+= QT_SELECT=${_QT_RELNAME}
.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include) .if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
Qt_Post_Include= bsd.qt.mk Qt_Post_Include= bsd.qt.mk
.if !defined(QT_NONSTANDARD) .if !defined(QT_NONSTANDARD)
CONFIGURE_ENV+= QTDIR="${PREFIX}" QMAKE="${QMAKE}" \ CONFIGURE_ENV+= QTDIR="${QT_ARCHDIR}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \ MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}" QMAKESPEC="${QMAKESPEC}"
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \ CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
--with-qt-libraries=${QT_LIBDIR} \ --with-qt-libraries=${QT_LIBDIR} \
--with-extra-includes=${LOCALBASE}/include \ --with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib --with-extra-libs=${LOCALBASE}/lib
.endif # !defined(QT_NONSTANDARD) .endif # !defined(QT_NONSTANDARD)
_USE_QT_ALL= assistant dbus declarative designer doc gui help \ _USE_QT_ALL= assistant dbus declarative designer doc gui help \
imageformats l10n linguist linguisttools multimedia \ imageformats l10n linguist linguisttools multimedia \
network opengl pixeltool qdbusviewer qmake script \ network opengl pixeltool qdbusviewer qmake script \
scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \ scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
sql-sqlite2 sql-sqlite3 svg testlib webkit \ sql-sqlite2 sql-sqlite3 svg testlib webkit \
xml xmlpatterns xml xmlpatterns
_USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \ _USE_QT4_ONLY= accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
codecs-kr codecs-tw corelib demo graphicssystems-opengl \ codecs-kr codecs-tw corelib demo graphicssystems-opengl \
help-tools iconengines inputmethods makeqpf moc phonon \ help-tools iconengines inputmethods makeqpf moc phonon \
phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \ phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
qtestlib qvfb rcc uic uic3 xmlpatterns-tool qtestlib qvfb rcc uic uic3 xmlpatterns-tool
_USE_QT5_ONLY= 3d buildtools canvas3d concurrent connectivity core \ _USE_QT5_ONLY= 3d buildtools canvas3d charts concurrent connectivity \
examples graphicaleffects location paths phonon4 \ core datavis3d declarative-render2d examples gamepad \
printsupport qdbus qdoc qdoc-data qev qml quick quickcontrols \ graphicaleffects location paths phonon4 printsupport \
quickcontrols2 sensors serialbus serialport sql-tds \ qdbus qdoc qdoc-data qev qml quick quickcontrols \
uiplugin uitools webchannel websockets widgets x11extras quickcontrols2 scxml sensors serialbus serialport \
sql-tds uiplugin uitools virtualkeyboard webchannel \
websockets widgets x11extras
3d_PORT= graphics/${_QT_RELNAME}-3d 3d_PORT= graphics/${_QT_RELNAME}-3d
rakucoUnsubmitted
Not Done
Inline Actions

Style: "# Components", not "#Components".

rakuco: Style: "# Components", not "#Components".
3d_LIB= libQt${_QT_LIBVER}3DCore.so 3d_LIB= libQt${_QT_LIBVER}3DCore.so
accessible_PORT= accessibility/${_QT_RELNAME}-accessible accessible_PORT= accessibility/${_QT_RELNAME}-accessible
accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so accessible_PATH= ${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so
assistant_PORT= devel/${_QT_RELNAME}-assistant assistant_PORT= devel/${_QT_RELNAME}-assistant
assistant_PATH= ${QT_BINDIR}/assistant${_QT_BINSUFX} assistant_PATH= ${QT_BINDIR}/assistant
assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp assistant-adp_PORT= devel/${_QT_RELNAME}-assistant-adp
assistant-adp_PATH= ${QT_BINDIR}/assistant_adp assistant-adp_PATH= ${QT_BINDIR}/assistant_adp
assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient assistantclient_PORT= devel/${_QT_RELNAME}-libqtassistantclient
assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so assistantclient_LIB= libQt${_QT_LIBVER}AssistantClient.so
buildtools_PORT= devel/${_QT_RELNAME}-buildtools buildtools_PORT= devel/${_QT_RELNAME}-buildtools
buildtools_PATH= ${MOC} buildtools_PATH= ${MOC}
canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d canvas3d_PORT= x11-toolkits/${_QT_RELNAME}-canvas3d
canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir canvas3d_PATH= ${QT_QMLDIR}/QtCanvas3D/qmldir
clucene_PORT= textproc/clucene-${_QT_RELNAME} charts_PORT= x11-toolkits/${_QT_RELNAME}-charts
charts_LIB= libQt${_QT_LIBVER}Charts.so
clucene_PORT= textproc/${_QT_RELNAME}-clucene
clucene_LIB= libQt${_QT_LIBVER}CLucene.so clucene_LIB= libQt${_QT_LIBVER}CLucene.so
codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn codecs-cn_PORT= chinese/${_QT_RELNAME}-codecs-cn
codecs-cn_PATH= ${QT_PLUGINDIR}/codecs/libqcncodecs.so codecs-cn_PATH= ${QT_PLUGINDIR}/codecs/libqcncodecs.so
codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp codecs-jp_PORT= japanese/${_QT_RELNAME}-codecs-jp
codecs-jp_PATH= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so codecs-jp_PATH= ${QT_PLUGINDIR}/codecs/libqjpcodecs.so
Show All 10 Lines
connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so connectivity_LIB= libQt${_QT_LIBVER}Bluetooth.so
core_PORT= devel/${_QT_RELNAME}-core core_PORT= devel/${_QT_RELNAME}-core
core_LIB= libQt${_QT_LIBVER}Core.so core_LIB= libQt${_QT_LIBVER}Core.so
corelib_PORT= devel/${_QT_RELNAME}-corelib corelib_PORT= devel/${_QT_RELNAME}-corelib
corelib_LIB= ${core_LIB} corelib_LIB= ${core_LIB}
dbus_PORT= devel/dbus-${_QT_RELNAME} datavis3d_PORT= x11-toolkits/${_QT_RELNAME}-datavis3d
datavis3d_LIB= libQt${_QT_LIBVER}DataVisualization.so
dbus_PORT= devel/${_QT_RELNAME}-dbus
dbus_LIB= libQt${_QT_LIBVER}DBus.so dbus_LIB= libQt${_QT_LIBVER}DBus.so
declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative declarative_PORT= x11-toolkits/${_QT_RELNAME}-declarative
declarative_LIB= libQt${_QT_LIBVER}Declarative.so declarative_LIB= libQt${_QT_LIBVER}Declarative.so
declarative-render2d_PORT= x11-toolkits/${_QT_RELNAME}-declarative-render2d
declarative-render2d_PATH= ${QT_PLUGINDIR}/scenegraph/libsoftwarecontext.so
demo_PORT= misc/${_QT_RELNAME}-qtdemo demo_PORT= misc/${_QT_RELNAME}-qtdemo
demo_PATH= ${QT_BINDIR}/qtdemo demo_PATH= ${QT_BINDIR}/qtdemo
designer_PORT= devel/${_QT_RELNAME}-designer designer_PORT= devel/${_QT_RELNAME}-designer
designer_PATH= ${QT_BINDIR}/designer${_QT_BINSUFX} designer_PATH= ${QT_BINDIR}/designer
doc_PORT= misc/${_QT_RELNAME}-doc doc_PORT= misc/${_QT_RELNAME}-doc
doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R} doc_PATH= ${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}
examples_PORT= misc/${_QT_RELNAME}-examples examples_PORT= misc/${_QT_RELNAME}-examples
examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R} examples_PATH= ${_QT_RELNAME}-examples>=${_QT_VERSION:R:R}
gamepad_PORT= x11-toolkits/${_QT_RELNAME}-gamepad
gamepad_LIB= libQt${_QT_LIBVER}Gamepad.so
graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects graphicaleffects_PORT= graphics/${_QT_RELNAME}-graphicaleffects
graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir graphicaleffects_PATH= ${QT_QMLDIR}/QtGraphicalEffects/qmldir
graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl graphicssystems-opengl_PORT= x11/${_QT_RELNAME}-graphicssystems-opengl
graphicssystems-opengl_PATH= ${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so graphicssystems-opengl_PATH= ${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so
gui_PORT= x11-toolkits/${_QT_RELNAME}-gui gui_PORT= x11-toolkits/${_QT_RELNAME}-gui
gui_LIB= libQt${_QT_LIBVER}Gui.so gui_LIB= libQt${_QT_LIBVER}Gui.so
Show All 9 Lines
imageformats_PORT= graphics/${_QT_RELNAME}-imageformats imageformats_PORT= graphics/${_QT_RELNAME}-imageformats
imageformats_PATH= ${QT_PLUGINDIR}/imageformats/libqtiff.so imageformats_PATH= ${QT_PLUGINDIR}/imageformats/libqtiff.so
inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods inputmethods_PORT= x11/${_QT_RELNAME}-inputmethods
inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so inputmethods_PATH= ${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so
linguist_PORT= devel/${_QT_RELNAME}-linguist linguist_PORT= devel/${_QT_RELNAME}-linguist
linguist_PATH= ${QT_BINDIR}/linguist${_QT_BINSUFX} linguist_PATH= ${QT_BINDIR}/linguist
linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools linguisttools_PORT= devel/${_QT_RELNAME}-linguisttools
linguisttools_PATH= ${LRELEASE} linguisttools_PATH= ${LRELEASE}
location_PORT= devel/${_QT_RELNAME}-location location_PORT= devel/${_QT_RELNAME}-location
location_LIB= libQt${_QT_LIBVER}Location.so location_LIB= libQt${_QT_LIBVER}Location.so
l10n_PORT= misc/${_QT_RELNAME}-l10n l10n_PORT= misc/${_QT_RELNAME}-l10n
l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R} l10n_PATH= ${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf makeqpf_PORT= devel/${_QT_RELNAME}-makeqpf
makeqpf_PATH= ${QT_BINDIR}/makeqpf${_QT_BINSUFX} makeqpf_PATH= ${QT_BINDIR}/makeqpf
moc_PORT= devel/${_QT_RELNAME}-moc moc_PORT= devel/${_QT_RELNAME}-moc
moc_PATH= ${MOC} moc_PATH= ${MOC}
multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia multimedia_PORT= multimedia/${_QT_RELNAME}-multimedia
multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so multimedia_LIB= libQt${_QT_LIBVER}Multimedia.so
network_PORT= net/${_QT_RELNAME}-network network_PORT= net/${_QT_RELNAME}-network
Show All 36 Lines
qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf qdoc-data_PATH= ${QT_DOCDIR}/global/config.qdocconf
qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3 qdoc3_PORT= devel/${_QT_RELNAME}-qdoc3
qdoc3_PATH= ${QT_BINDIR}/qdoc3 qdoc3_PATH= ${QT_BINDIR}/qdoc3
qev_PORT= x11/${_QT_RELNAME}-qev qev_PORT= x11/${_QT_RELNAME}-qev
qev_PATH= ${QT_BINDIR}/qev qev_PATH= ${QT_BINDIR}/qev
qmake_PORT= devel/qmake${_QT_VERSION:R:R} qmake_PORT= devel/${_QT_RELNAME}-qmake
qmake_PATH= ${QMAKE} qmake_PATH= ${QMAKE}
qml_PORT= lang/${_QT_RELNAME}-qml qml_PORT= lang/${_QT_RELNAME}-qml
qml_LIB= libQt${_QT_LIBVER}Qml.so qml_LIB= libQt${_QT_LIBVER}Qml.so
qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer qmlviewer_PORT= devel/${_QT_RELNAME}-qmlviewer
qmlviewer_PATH= ${QT_BINDIR}/qmlviewer qmlviewer_PATH= ${QT_BINDIR}/qmlviewer
qt3support_PORT= devel/${_QT_RELNAME}-qt3support qt3support_PORT= devel/${_QT_RELNAME}-qt3support
qt3support_LIB= libQt${_QT_LIBVER}3Support.so qt3support_LIB= libQt${_QT_LIBVER}3Support.so
qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig qtconfig_PORT= misc/${_QT_RELNAME}-qtconfig
qtconfig_PATH= ${QT_BINDIR}/qtconfig${_QT_BINSUFX} qtconfig_PATH= ${QT_BINDIR}/qtconfig
qtestlib_PORT= ${testlib_PORT} qtestlib_PORT= ${testlib_PORT}
qtestlib_LIB= ${testlib_LIB} qtestlib_LIB= ${testlib_LIB}
quick_PORT= x11-toolkits/${_QT_RELNAME}-quick quick_PORT= x11-toolkits/${_QT_RELNAME}-quick
quick_LIB= libQt${_QT_LIBVER}Quick.so quick_LIB= libQt${_QT_LIBVER}Quick.so
quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols quickcontrols_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols
quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir quickcontrols_PATH= ${QT_QMLDIR}/QtQuick/Controls/qmldir
quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2 quickcontrols2_PORT= x11-toolkits/${_QT_RELNAME}-quickcontrols2
quickcontrols2_LIB= libQt${_QT_LIBVER}LabsTemplates.so quickcontrols2_LIB= libQt${_QT_LIBVER}QuickControls2.so
qvfb_PORT= devel/${_QT_RELNAME}-qvfb qvfb_PORT= devel/${_QT_RELNAME}-qvfb
qvfb_PATH= ${QT_BINDIR}/qvfb${_QT_BINSUFX} qvfb_PATH= ${QT_BINDIR}/qvfb
rcc_PORT= devel/${_QT_RELNAME}-rcc rcc_PORT= devel/${_QT_RELNAME}-rcc
rcc_PATH= ${RCC} rcc_PATH= ${RCC}
sensors_PORT= comms/${_QT_RELNAME}-sensors sensors_PORT= comms/${_QT_RELNAME}-sensors
sensors_LIB= libQt${_QT_LIBVER}Sensors.so sensors_LIB= libQt${_QT_LIBVER}Sensors.so
script_PORT= devel/${_QT_RELNAME}-script script_PORT= devel/${_QT_RELNAME}-script
script_LIB= libQt${_QT_LIBVER}Script.so script_LIB= libQt${_QT_LIBVER}Script.so
scripttools_PORT= devel/${_QT_RELNAME}-scripttools scripttools_PORT= devel/${_QT_RELNAME}-scripttools
scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so scripttools_LIB= libQt${_QT_LIBVER}ScriptTools.so
scxml_PORT= devel/${_QT_RELNAME}-scxml
scxml_LIB= libQt${_QT_LIBVER}Scxml.so
serialbus_PORT= comms/${_QT_RELNAME}-serialbus serialbus_PORT= comms/${_QT_RELNAME}-serialbus
serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so serialbus_LIB= libQt${_QT_LIBVER}SerialBus.so
serialport_PORT= comms/${_QT_RELNAME}-serialport serialport_PORT= comms/${_QT_RELNAME}-serialport
serialport_LIB= libQt${_QT_LIBVER}SerialPort.so serialport_LIB= libQt${_QT_LIBVER}SerialPort.so
sql_PORT= databases/${_QT_RELNAME}-sql sql_PORT= databases/${_QT_RELNAME}-sql
sql_LIB= libQt${_QT_LIBVER}Sql.so sql_LIB= libQt${_QT_LIBVER}Sql.so
Show All 28 Lines
uic3_PATH= ${QT_BINDIR}/uic3 uic3_PATH= ${QT_BINDIR}/uic3
uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin uiplugin_PORT= x11-toolkits/${_QT_RELNAME}-uiplugin
uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin uiplugin_PATH= ${QT_INCDIR}/QtUiPlugin/QtUiPlugin
uitools_PORT= devel/${_QT_RELNAME}-uitools uitools_PORT= devel/${_QT_RELNAME}-uitools
uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a uitools_PATH= ${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a
virtualkeyboard_PORT= x11-toolkits/${_QT_RELNAME}-virtualkeyboard
virtualkeyboard_PATH= ${QT_PLUGINDIR}/platforminputcontexts/libqtvirtualkeyboardplugin.so
webchannel_PORT= www/${_QT_RELNAME}-webchannel webchannel_PORT= www/${_QT_RELNAME}-webchannel
webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so webchannel_LIB= libQt${_QT_LIBVER}WebChannel.so
websockets_PORT= www/${_QT_RELNAME}-websockets websockets_PORT= www/${_QT_RELNAME}-websockets
websockets_LIB= libQt${_QT_LIBVER}WebSockets.so websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
webkit_PORT= www/webkit-${_QT_RELNAME} webkit_PORT= www/${_QT_RELNAME}-webkit
webkit_LIB= libQt${_QT_LIBVER}WebKit.so webkit_LIB= libQt${_QT_LIBVER}WebKit.so
widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets widgets_PORT= x11-toolkits/${_QT_RELNAME}-widgets
widgets_LIB= libQt${_QT_LIBVER}Widgets.so widgets_LIB= libQt${_QT_LIBVER}Widgets.so
x11extras_PORT= x11/${_QT_RELNAME}-x11extras x11extras_PORT= x11/${_QT_RELNAME}-x11extras
x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so x11extras_LIB= libQt${_QT_LIBVER}X11Extras.so
▲ Show 20 Lines • Show All 62 Lines • ▼ Show 20 Lines
. endif . endif
. if ${PORTNAME} != "dbus" . if ${PORTNAME} != "dbus"
_QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp _QT_TOOLS+= qdbuscpp2xml qdbusxml2cpp
. endif . endif
. if ${PORTNAME} != "widgets" . if ${PORTNAME} != "widgets"
_QT_TOOLS+= ${UIC} _QT_TOOLS+= ${UIC}
. endif . endif
# The list of QtBase components that need to be linked into WRKSRC/lib for
# other QtBase ports. See below.
_QT5_BASE= core dbus gui network sql widgets
pre-configure: qtbase-pre-configure pre-configure: qtbase-pre-configure
qtbase-pre-configure: qtbase-pre-configure:
. for tool in ${_QT_TOOLS} . for tool in ${_QT_TOOLS}
tcbernerAuthorUnsubmitted
Not Done
Inline Actions

I've been thinking of dropping this here, and defining _LINK components for these, and handling them like the other base dependencies in lines 680-688.
(This would probably require some modifications to switch between ${QT_LIBDIR}/${comp_lib} resp ${QT_BINDIR}/${comp_bin} or something).

But maybe it would be a nice simplification...

tcberner: I've been thinking of dropping this here, and defining _LINK components for these, and handling…
@${TEST} -e ${QT_BINDIR}/${tool:T} && \ @${TEST} -e ${QT_BINDIR}/${tool:T} && \
${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \ ${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
${TRUE} ${TRUE}
. endfor . endfor
# The following is a fix for the inplace upgrade problem we faced (see
# QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
# which previously was adressed by making sure, that ${LOCALBASE}/lib, which
# would often gets added by pkgconf for the dependencies, was passed after
# ${WRKSRC}/lib.
# * We fix the inplace upgrade problem by moving the Qt5 libraries into
# ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
# * However, this means, that the ports belonging to the split up QtBase package
# now no longer can find their depending QtBase libraries. We fix this by
# linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
# on them.
. if ${QT_DIST:Mbase}
. for basedep in ${_QT5_BASE}
. if ${USE_QT5:M${basedep}}
${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
. endif
. endfor
. endif
#
# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
#
# Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out # Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
# certain paths from pkg-config calls (see the explanation in # certain paths from pkg-config calls (see the explanation in
# devel/qt5/files/patch-configure) as well as for setting # devel/qt5/files/patch-configure) as well as for setting
# QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for # QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
# ports/194088. # ports/194088.
post-patch: qtbase-post-patch post-patch: qtbase-post-patch
qtbase-post-patch: qtbase-post-patch:
rakucoUnsubmitted
Done
Inline Actions

I think this can moved before the "Add ${LOCALBASE}/lib" block.

rakuco: I think this can moved before the "Add ${LOCALBASE}/lib" block.
${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \ ${REINPLACE_CMD} -e "/DEFAULT_LIBDIRS=/ s,\\\\\"\\\\n,\\\\n${LOCALBASE}/lib&," \
${WRKSRC}/configure ${WRKSRC}/configure
. if ${PORTNAME} != "qmake" . if ${PORTNAME} != "qmake"
_QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
post-configure: qmake-configure post-configure: qmake-configure
. endif . endif
. endif # ${QT_DIST} == "base" . endif # ${QT_DIST} == "base"
pre-configure: qt5-pre-configure pre-configure: qt5-pre-configure
qt5-pre-configure: qt5-pre-configure:
# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that # Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
# requires tests/auto/cmake to be present, otherwise the configure stage will # requires tests/auto/cmake to be present, otherwise the configure stage will
# fail. # fail.
# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same # Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
# time, we have to disable the check in a cache file (the only way to get this # time, we have to disable the check in a cache file (the only way to get this
# value through to the configure script in qtbase). # value through to the configure script in qtbase).
${MKDIR} ${CONFIGURE_WRKSRC} ${MKDIR} ${CONFIGURE_WRKSRC}
${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
#
# **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
#
# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
# the linker before -L/usr/local/lib. By default, the opposite happens, which # the linker before -L/usr/local/lib. By default, the opposite happens, which
# is a problem when a Qt port is being upgraded, since an existing library # is a problem when a Qt port is being upgraded, since an existing library
# would end up being picked up instead of those built in ${WRKSRC}/lib. Since # would end up being picked up instead of those built in ${WRKSRC}/lib. Since
# qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
# latter to get the linker path order right. qmake is smart enough to strip # latter to get the linker path order right. qmake is smart enough to strip
# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
# See QTBUG-40825 and ports bugs 194088, 195105 and 198720. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines