From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 21 Jun 2018 21:38:59 +0200
To: Stefan Sonski <s.sonski@gmail.com>
Message-ID: <20180621193859.GA1842@jama>
References: <20180327180159.9837-1-s.sonski@gmail.com>
MIME-Version: 1.0
In-Reply-To: <20180327180159.9837-1-s.sonski@gmail.com>
User-Agent: Mutt/1.10.0 (2018-05-17)
Cc: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-qt5][PATCH] nativesdk-qtbase Enable objcopy for qmake
Precedence: list
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="fdj2RfSjLxBAspz7"
Content-Disposition: inline

--fdj2RfSjLxBAspz7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Mar 27, 2018 at 08:01:59PM +0200, Stefan Sonski wrote:
> Enable objcopy for qmake to support separate_debug_info flag for cross-co=
mpiled
> applications in nativesdk-qtbase.
>=20
> Signed-off-by: Stefan Sonski <s.sonski@gmail.com>
> ---
>  classes/qmake5_base.bbclass                        |  2 ++
>  recipes-qt/qt5/nativesdk-qtbase_git.bb             |  2 ++
>  .../0013-Add-objcopy-to-linux-oe-gplatform.patch   | 32 ++++++++++++++++=
++++++
>  3 files changed, 36 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtbase/0013-Add-objcopy-to-linux-oe-gp=
latform.patch
>=20
> diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
> index 8f1d143..bfde1d2 100644
> --- a/classes/qmake5_base.bbclass
> +++ b/classes/qmake5_base.bbclass
> @@ -28,6 +28,7 @@ EXTRA_OEMAKE =3D " \
>      OE_QMAKE_LINK=3D'${OE_QMAKE_LINK}' \
>      OE_QMAKE_LDFLAGS=3D'${OE_QMAKE_LDFLAGS}' \
>      OE_QMAKE_AR=3D'${OE_QMAKE_AR}' \
> +    OE_QMAKE_OBJCOPY=3D'${OE_QMAKE_OBJCOPY}' \
>      OE_QMAKE_STRIP=3D'${OE_QMAKE_STRIP}' \
>      OE_QMAKE_INCDIR_QT=3D'${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}=
' \
>  "
> @@ -41,6 +42,7 @@ export OE_QMAKE_CXXFLAGS =3D "${CXXFLAGS}"
>  export OE_QMAKE_LINK =3D "${CXX}"
>  export OE_QMAKE_LDFLAGS =3D "${LDFLAGS}"
>  export OE_QMAKE_AR =3D "${AR}"
> +export OE_QMAKE_OBJCOPY =3D "${OBJCOPY}"
>  export OE_QMAKE_STRIP =3D "echo"
> =20
>  # qmake reads if from shell environment
> diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nati=
vesdk-qtbase_git.bb
> index efcb82c..f4d80e9 100644
> --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
> +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
> @@ -40,6 +40,7 @@ SRC_URI +=3D "\
>      file://0010-linux-clang-Invert-conditional-for-defining-QT_SOCKL.pat=
ch \
>      file://0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch \
>      file://0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.pat=
ch \
> +    file://0013-Add-objcopy-to-linux-oe-gplatform.patch \

You're adding the patch in section which says:
# common for qtbase-native, qtbase-nativesdk and qtbase
but you're adding it only in nativesdk-qtbase

>  "
> =20
>  # common for qtbase-native and nativesdk-qtbase
> @@ -192,6 +193,7 @@ fakeroot do_generate_qt_environment_file() {
>      echo 'export OE_QMAKE_CXX=3D$CXX' >> $script
>      echo 'export OE_QMAKE_LINK=3D$CXX' >> $script
>      echo 'export OE_QMAKE_AR=3D$AR' >> $script
> +    echo 'export OE_QMAKE_OBJCOPY=3D$OBJCOPY' >> $script
>      echo 'export OE_QMAKE_STRIP=3D$STRIP' >> $script
>      echo 'export QT_CONF_PATH=3D${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $=
script
>      echo 'export OE_QMAKE_LIBDIR_QT=3D`qmake -query QT_INSTALL_LIBS`' >>=
 $script
> diff --git a/recipes-qt/qt5/qtbase/0013-Add-objcopy-to-linux-oe-gplatform=
=2Epatch b/recipes-qt/qt5/qtbase/0013-Add-objcopy-to-linux-oe-gplatform.pat=
ch
> new file mode 100644
> index 0000000..fcbce51
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0013-Add-objcopy-to-linux-oe-gplatform.patch
> @@ -0,0 +1,32 @@
> +From 487c7a7704106eda0cfea9d9652cb42b9889b5e2 Mon Sep 17 00:00:00 2001
> +From: Stefan Sonski <s.sonski@gmail.com>
> +Date: Tue, 27 Mar 2018 19:38:13 +0200
> +Subject: [PATCH] Add objcopy to linux oe gplatform
> +
> +---
> + mkspecs/linux-oe-g++/qmake.conf | 3 +--
> + 1 file changed, 1 insertion(+), 2 deletions(-)
> +
> +diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmak=
e.conf
> +index 30d31ed16d..740f3bab9d 100644
> +--- a/mkspecs/linux-oe-g++/qmake.conf
> ++++ b/mkspecs/linux-oe-g++/qmake.conf
> +@@ -10,6 +10,7 @@ include(../common/linux.conf)
> +=20
> + # QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip
> + QMAKE_AR              =3D $$(OE_QMAKE_AR) cqs
> ++QMAKE_OBJCOPY         =3D $$(OE_QMAKE_OBJCOPY)
> + QMAKE_STRIP           =3D $$(OE_QMAKE_STRIP)
> +=20
> + include(../common/gcc-base-unix.conf)
> +@@ -36,7 +37,5 @@ QMAKE_LINK_C_SHLIB =3D $$(OE_QMAKE_LINK)
> + # for the SDK
> + isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG =3D $$(OE_QMAKE_QT_CONFIG)
> +=20
> +-include(../oe-device-extra.pri)
> +-
> + load(device_config)
> + load(qt_config)
> +--=20
> +2.16.2
> +
> --=20
> 2.16.2
>=20
> --=20
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

--=20
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

--fdj2RfSjLxBAspz7
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----

iF0EARECAB0WIQRU+ejDffEzV2Je2oc3VSO3ZXaAHAUCWyv+0wAKCRA3VSO3ZXaA
HBoIAJ9GpQotYNpJvS+YI/3iKxKKKw24gQCfZX65rGtL3GIHKoABjTmKNdKvJ08=
=UdhX
-----END PGP SIGNATURE-----

--fdj2RfSjLxBAspz7--