mirror of
https://git.yoctoproject.org/poky
synced 2026-04-27 21:32:13 +02:00
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy. Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with meta-qt3 and meta-qt5. (From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
0baadc8a98
commit
8b11ed8a75
@@ -24,7 +24,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
|
||||
# - nfs-client - NFS client
|
||||
# - ssh-server-dropbear - SSH server (dropbear)
|
||||
# - ssh-server-openssh - SSH server (openssh)
|
||||
# - qt4-pkgs - Qt4/X11 and demo applications
|
||||
# - hwcodecs - Install hardware acceleration codecs
|
||||
# - package-management - installs package management tools and preserves the package manager database
|
||||
# - debug-tweaks - makes an image suitable for development, e.g. allowing passwordless root logins
|
||||
@@ -46,7 +45,6 @@ FEATURE_PACKAGES_nfs-server = "packagegroup-core-nfs-server"
|
||||
FEATURE_PACKAGES_nfs-client = "packagegroup-core-nfs-client"
|
||||
FEATURE_PACKAGES_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
|
||||
FEATURE_PACKAGES_ssh-server-openssh = "packagegroup-core-ssh-openssh"
|
||||
FEATURE_PACKAGES_qt4-pkgs = "packagegroup-core-qt-demoapps"
|
||||
FEATURE_PACKAGES_hwcodecs = "${MACHINE_HWCODECS}"
|
||||
|
||||
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
#
|
||||
# QMake variables for Qt4
|
||||
#
|
||||
inherit qmake_base
|
||||
|
||||
DEPENDS_prepend = "qt4-tools-native "
|
||||
|
||||
export QMAKESPEC = "${STAGING_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++"
|
||||
export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/qt4/mkspecs/qconfig.pri"
|
||||
export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
|
||||
export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
|
||||
export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
|
||||
export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
|
||||
export OE_QMAKE_QDBUSCPP2XML = "${STAGING_BINDIR_NATIVE}/qdbuscpp2xml4"
|
||||
export OE_QMAKE_QDBUSXML2CPP = "${STAGING_BINDIR_NATIVE}/qdbusxml2cpp4"
|
||||
export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
|
||||
export OE_QMAKE_LINK = "${CXX}"
|
||||
export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
|
||||
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4"
|
||||
export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
|
||||
export OE_QMAKE_LIBS_QT = "qt"
|
||||
export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
|
||||
export OE_QMAKE_LIBS_X11SM = "-lSM -lICE"
|
||||
export OE_QMAKE_LCONVERT = "${STAGING_BINDIR_NATIVE}/lconvert4"
|
||||
export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4"
|
||||
export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4"
|
||||
export OE_QMAKE_XMLPATTERNS = "${STAGING_BINDIR_NATIVE}/xmlpatterns4"
|
||||
@@ -1,119 +0,0 @@
|
||||
QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/qmake"
|
||||
|
||||
OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++"
|
||||
QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}"
|
||||
|
||||
# We override this completely to eliminate the -e normally passed in
|
||||
EXTRA_OEMAKE = ""
|
||||
|
||||
export OE_QMAKE_CC="${CC}"
|
||||
export OE_QMAKE_CFLAGS="${CFLAGS}"
|
||||
export OE_QMAKE_CXX="${CXX}"
|
||||
export OE_QMAKE_LDFLAGS="${LDFLAGS}"
|
||||
export OE_QMAKE_AR="${AR}"
|
||||
export OE_QMAKE_STRIP="echo"
|
||||
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
|
||||
|
||||
# default to qte2 via bb.conf, inherit qt3x11 to configure for qt3x11
|
||||
|
||||
oe_qmake_mkspecs () {
|
||||
mkdir -p mkspecs/${OE_QMAKE_PLATFORM}
|
||||
for f in ${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}/*; do
|
||||
if [ -L $f ]; then
|
||||
lnk=`readlink $f`
|
||||
if [ -f mkspecs/${OE_QMAKE_PLATFORM}/$lnk ]; then
|
||||
ln -s $lnk mkspecs/${OE_QMAKE_PLATFORM}/`basename $f`
|
||||
else
|
||||
cp $f mkspecs/${OE_QMAKE_PLATFORM}/
|
||||
fi
|
||||
else
|
||||
cp $f mkspecs/${OE_QMAKE_PLATFORM}/
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
do_generate_qt_config_file() {
|
||||
export QT_CONF_PATH=${WORKDIR}/qt.conf
|
||||
cat > ${WORKDIR}/qt.conf <<EOF
|
||||
[Paths]
|
||||
Prefix =
|
||||
Binaries = ${STAGING_BINDIR_NATIVE}
|
||||
Headers = ${STAGING_INCDIR}/${QT_DIR_NAME}
|
||||
Plugins = ${STAGING_LIBDIR}/${QT_DIR_NAME}/plugins/
|
||||
Mkspecs = ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/
|
||||
EOF
|
||||
}
|
||||
|
||||
addtask generate_qt_config_file after do_patch before do_configure
|
||||
|
||||
qmake_base_do_configure() {
|
||||
case ${QMAKESPEC} in
|
||||
*linux-oe-g++|*linux-uclibc-oe-g++|*linux-gnueabi-oe-g++|*linux-uclibceabi-oe-g++|*linux-gnuspe-oe-g++|*linux-uclibcspe-oe-g++|*linux-gnun32-oe-g++)
|
||||
;;
|
||||
*-oe-g++)
|
||||
die Unsupported target ${TARGET_OS} for oe-g++ qmake spec
|
||||
;;
|
||||
*)
|
||||
bbnote Searching for qmake spec file
|
||||
paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-${TARGET_ARCH}-g++"
|
||||
paths="${QMAKE_MKSPEC_PATH}/${TARGET_OS}-g++ $paths"
|
||||
|
||||
if (echo "${TARGET_ARCH}"|grep -q 'i.86'); then
|
||||
paths="${QMAKE_MKSPEC_PATH}/qws/${TARGET_OS}-x86-g++ $paths"
|
||||
fi
|
||||
for i in $paths; do
|
||||
if test -e $i; then
|
||||
export QMAKESPEC=$i
|
||||
break
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
bbnote "using qmake spec in ${QMAKESPEC}, using profiles '${QMAKE_PROFILES}'"
|
||||
|
||||
if [ -z "${QMAKE_PROFILES}" ]; then
|
||||
PROFILES="`ls *.pro`"
|
||||
else
|
||||
PROFILES="${QMAKE_PROFILES}"
|
||||
fi
|
||||
|
||||
if [ -z "$PROFILES" ]; then
|
||||
die "QMAKE_PROFILES not set and no profiles found in $PWD"
|
||||
fi
|
||||
|
||||
if [ ! -z "${EXTRA_QMAKEVARS_POST}" ]; then
|
||||
AFTER="-after"
|
||||
QMAKE_VARSUBST_POST="${EXTRA_QMAKEVARS_POST}"
|
||||
bbnote "qmake postvar substitution: ${EXTRA_QMAKEVARS_POST}"
|
||||
fi
|
||||
|
||||
if [ ! -z "${EXTRA_QMAKEVARS_PRE}" ]; then
|
||||
QMAKE_VARSUBST_PRE="${EXTRA_QMAKEVARS_PRE}"
|
||||
bbnote "qmake prevar substitution: ${EXTRA_QMAKEVARS_PRE}"
|
||||
fi
|
||||
|
||||
# Hack .pro files to use OE utilities
|
||||
LCONVERT_NAME=$(basename ${OE_QMAKE_LCONVERT})
|
||||
LRELEASE_NAME=$(basename ${OE_QMAKE_LRELEASE})
|
||||
LUPDATE_NAME=$(basename ${OE_QMAKE_LUPDATE})
|
||||
XMLPATTERNS_NAME=$(basename ${OE_QMAKE_XMLPATTERNS})
|
||||
find -name '*.pro' \
|
||||
-exec sed -i -e "s|\(=\s*.*\)/$LCONVERT_NAME|\1/lconvert|g" \
|
||||
-e "s|\(=\s*.*\)/$LRELEASE_NAME|\1/lrelease|g" \
|
||||
-e "s|\(=\s*.*\)/$LUPDATE_NAME|\1/lupdate|g" \
|
||||
-e "s|\(=\s*.*\)/$XMLPATTERNS_NAME|\1/xmlpatterns|g" \
|
||||
-e "s|\(=\s*.*\)/lconvert|\1/$LCONVERT_NAME|g" \
|
||||
-e "s|\(=\s*.*\)/lrelease|\1/$LRELEASE_NAME|g" \
|
||||
-e "s|\(=\s*.*\)/lupdate|\1/$LUPDATE_NAME|g" \
|
||||
-e "s|\(=\s*.*\)/xmlpatterns|\1/$XMLPATTERNS_NAME|g" \
|
||||
'{}' ';'
|
||||
|
||||
#bbnote "Calling '${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST'"
|
||||
unset QMAKESPEC || true
|
||||
${OE_QMAKE_QMAKE} -makefile -spec ${QMAKESPEC} -o Makefile $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST || die "Error calling ${OE_QMAKE_QMAKE} on $PROFILES"
|
||||
}
|
||||
|
||||
EXPORT_FUNCTIONS do_configure
|
||||
|
||||
addtask configure after do_unpack do_patch before do_compile
|
||||
@@ -1,21 +0,0 @@
|
||||
QT4EDEPENDS ?= "qt4-embedded "
|
||||
DEPENDS_prepend = "${QT4EDEPENDS}"
|
||||
|
||||
inherit qmake2
|
||||
|
||||
QT_BASE_NAME = "qt4-embedded"
|
||||
QT_DIR_NAME = "qtopia"
|
||||
QT_LIBINFIX = "E"
|
||||
# override variables set by qmake-base to compile Qt/Embedded apps
|
||||
#
|
||||
export QMAKESPEC = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/${TARGET_OS}-oe-g++"
|
||||
export OE_QMAKE_QT_CONFIG = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/qconfig.pri"
|
||||
export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/${QT_DIR_NAME}"
|
||||
export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}"
|
||||
export OE_QMAKE_LIBS_QT = "qt"
|
||||
export OE_QMAKE_LIBS_X11 = ""
|
||||
export OE_QMAKE_EXTRA_MODULES = "network"
|
||||
EXTRA_QMAKEVARS_PRE += " QT_LIBINFIX=${QT_LIBINFIX} "
|
||||
|
||||
# Qt4 uses atomic instructions not supported in thumb mode
|
||||
ARM_INSTRUCTION_SET = "arm"
|
||||
@@ -1,14 +0,0 @@
|
||||
QT4DEPENDS ?= "qt4-x11 "
|
||||
DEPENDS_prepend = "${QT4DEPENDS}"
|
||||
|
||||
# depends on qt4-x11
|
||||
REQUIRED_DISTRO_FEATURES += "x11"
|
||||
|
||||
inherit qmake2 distro_features_check
|
||||
|
||||
QT_BASE_NAME = "qt4"
|
||||
QT_DIR_NAME = "qt4"
|
||||
QT_LIBINFIX = ""
|
||||
|
||||
# Qt4 uses atomic instructions not supported in thumb mode
|
||||
ARM_INSTRUCTION_SET = "arm"
|
||||
Reference in New Issue
Block a user