[OE-core] [PATCH 09/45] python3: manipulate all of the config*/Makefile files, not just config/Makefile

[Martin Jansa]

On Tue, May 24, 2016 at 02:53:58PM +0300, Alexander Kanavin wrote:
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>  meta/recipes-devtools/python/python3_3.5.1.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/recipes-devtools/python/python3_3.5.1.bb b/meta/recipes-devtools/python/python3_3.5.1.bb
> index 26d05c7..1c8fe2f 100644
> --- a/meta/recipes-devtools/python/python3_3.5.1.bb
> +++ b/meta/recipes-devtools/python/python3_3.5.1.bb
> @@ -164,6 +164,7 @@ do_install() {
>  	rm -f ${D}/${bindir}/2to3
>  
>  	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile
> +	install -m 0644 Makefile.sysroot ${D}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

>  	if [ -e ${WORKDIR}/sitecustomize.py ]; then
>  		install -m 0644 ${WORKDIR}/sitecustomize.py ${D}/${libdir}/python${PYTHON_MAJMIN}
> @@ -182,9 +183,11 @@ PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
>  py_package_preprocess () {
>  	# copy back the old Makefile to fix target package
>  	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

> +	install -m 0644 ${B}/Makefile.orig ${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile
>  	# Remove references to buildmachine paths in target Makefile and _sysconfigdata
>  	sed -i -e 's:--sysroot=${STAGING_DIR_TARGET}::g' -e s:'--with-libtool-sysroot=${STAGING_DIR_TARGET}'::g \
>  		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config/Makefile \
> +		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/config-${PYTHON_MAJMIN}m/Makefile \

Shouldn't it use "PYTHON_ABI" variable instead of "m"?

>  		${PKGD}/${libdir}/python${PYTHON_MAJMIN}/_sysconfigdata.py
>  }
>  
> -- 
> 2.8.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160524/ad1492a1/attachment-0002.sig>