All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt3][PATCH] classes: add qmake_base.bbclass
@ 2016-04-20 11:49 Adrian Dudau
  0 siblings, 0 replies; 4+ messages in thread
From: Adrian Dudau @ 2016-04-20 11:49 UTC (permalink / raw)
  To: yocto

The class was removed from oe classes, but some recipes like
qt-x11-free still inherit it. Keep the class within the layer to
acommmodate them.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 classes/qmake_base.bbclass | 119 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 classes/qmake_base.bbclass

diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass
new file mode 100644
index 0000000..dc98713
--- /dev/null
+++ b/classes/qmake_base.bbclass
@@ -0,0 +1,119 @@
+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.9.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [meta-qt3][PATCH] classes: add qmake_base.bbclass
  2016-04-12 10:29 ` Adrian Dudau
@ 2016-08-29  0:06   ` Paul Eggleton
  0 siblings, 0 replies; 4+ messages in thread
From: Paul Eggleton @ 2016-08-29  0:06 UTC (permalink / raw)
  To: Adrian Dudau; +Cc: yocto

Hi Adrian,

On Tue, 12 Apr 2016 10:29:15 Adrian Dudau wrote:
> On mån, 2016-03-07 at 14:30 +0100, Adrian Dudau wrote:
> 
> > The class was removed from oe classes, but some recipes like
> > qt-x11-free still inherit it. Keep the class within the layer to
> > acommmodate them.
> 
> ping?

I completely missed this until now, sorry - I've just applied it to the master 
and krogoth branches.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [meta-qt3][PATCH] classes: add qmake_base.bbclass
  2016-03-07 13:30 Adrian Dudau
@ 2016-04-12 10:29 ` Adrian Dudau
  2016-08-29  0:06   ` Paul Eggleton
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Dudau @ 2016-04-12 10:29 UTC (permalink / raw)
  To: yocto

On mån, 2016-03-07 at 14:30 +0100, Adrian Dudau wrote:
> The class was removed from oe classes, but some recipes like
> qt-x11-free still inherit it. Keep the class within the layer to
> acommmodate them.
> 
> Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
> ---
>  classes/qmake_base.bbclass | 119 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 119 insertions(+)
>  create mode 100644 classes/qmake_base.bbclass
> 
> diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass
> new file mode 100644
> index 0000000..dc98713
> --- /dev/null
> +++ b/classes/qmake_base.bbclass
> @@ -0,0 +1,119 @@
> +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.9.1
> 

ping?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [meta-qt3][PATCH] classes: add qmake_base.bbclass
@ 2016-03-07 13:30 Adrian Dudau
  2016-04-12 10:29 ` Adrian Dudau
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Dudau @ 2016-03-07 13:30 UTC (permalink / raw)
  To: yocto

The class was removed from oe classes, but some recipes like
qt-x11-free still inherit it. Keep the class within the layer to
acommmodate them.

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 classes/qmake_base.bbclass | 119 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 classes/qmake_base.bbclass

diff --git a/classes/qmake_base.bbclass b/classes/qmake_base.bbclass
new file mode 100644
index 0000000..dc98713
--- /dev/null
+++ b/classes/qmake_base.bbclass
@@ -0,0 +1,119 @@
+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.9.1



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-08-29  0:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-20 11:49 [meta-qt3][PATCH] classes: add qmake_base.bbclass Adrian Dudau
  -- strict thread matches above, loose matches on Subject: below --
2016-03-07 13:30 Adrian Dudau
2016-04-12 10:29 ` Adrian Dudau
2016-08-29  0:06   ` Paul Eggleton

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.