From patchwork Tue Mar 18 06:15:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajendra Desai X-Patchwork-Id: 59345 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F8BAC35FF8 for ; Tue, 18 Mar 2025 06:15:32 +0000 (UTC) Received: from mx0a-00300601.pphosted.com (mx0a-00300601.pphosted.com [148.163.146.64]) by mx.groups.io with SMTP id smtpd.web10.5323.1742278529902685844 for ; Mon, 17 Mar 2025 23:15:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@emerson.com header.s=email header.b=3RUINlN9; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: emerson.com, ip: 148.163.146.64, mailfrom: prvs=217209fed9=rajendra.desai@emerson.com) Received: from pps.filterd (m0359308.ppops.net [127.0.0.1]) by mx0b-00300601.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 52I5oMGl030187 for ; Tue, 18 Mar 2025 06:15:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emerson.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=email; bh=UBFmROsgIPbZUEUDjcU+lABEEg VfCMM6V82Ny7n3OLM=; b=3RUINlN9qwgk1zn/jioVCpphv2yLKMAimU4CYNYEo3 TM8JFL/KwLDRHVoqeVFIcnE1IiOJJpEWEGF6+D50/MZl7V60aIOpHoHPviS/Zmy7 lazEPUmwX2LfXwIzYmz5jwOHhwathVd1wydBhySyis/wQIcuWPbG/rFB6FsRJo/8 3T+3jeS3Dl6lE3AaEt38MohkImQ7VODlydrBvMNHSaT9LxbWLQexv2HhpxbHAPa1 kRTaJHtqYgYtvTF+ErhiHfIJnRAMHFDbxfdVpRNWS9nq2tXIXcdZxAA14Q0JU0MG gv2XQbBzOmCMNH8BXaY87UcmwUh7gKNBtsVAFkctcshg== Received: from us-aus-excas-p2.ni.corp.natinst.com ([130.164.94.74]) by mx0b-00300601.pphosted.com (PPS) with ESMTPS id 45f1y398u0-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 18 Mar 2025 06:15:29 +0000 (GMT) Received: from us-aus-excas-p1.ni.corp.natinst.com (130.164.68.17) by us-aus-excas-p2.ni.corp.natinst.com (130.164.68.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Tue, 18 Mar 2025 01:15:19 -0500 Received: from sombRayRo.ni.corp.natinst.com (172.18.68.32) by us-aus-excas-p1.ni.corp.natinst.com (130.164.68.17) with Microsoft SMTP Server id 15.2.1258.28 via Frontend Transport; Tue, 18 Mar 2025 01:15:18 -0500 From: Rajendra Desai To: CC: Rajendra Desai Subject: [scarthgap][PATCH] perl-ptest: copy xconfig data from perl source directory Date: Tue, 18 Mar 2025 11:45:09 +0530 Message-ID: <20250318061509.1737383-1-rajendra.desai@emerson.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: u66ygr-6pA_2hGfNFQcJkP_IK_yDi-lh X-Proofpoint-GUID: u66ygr-6pA_2hGfNFQcJkP_IK_yDi-lh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1093,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-03-18_03,2025-03-17_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 impostorscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 bulkscore=0 adultscore=0 mlxlogscore=999 lowpriorityscore=0 phishscore=0 clxscore=1015 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2503180042 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 18 Mar 2025 06:15:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213165 The following perl ptests: - dist/ExtUtils-ParseXS/t/001-basic - dist/ExtUtils-ParseXS/t/002-more - dist/ExtUtils-ParseXS/t/003-usage - cpan/ExtUtils-Constant/t/Constant - cpan/ExtUtils-MakeMaker/t/02-xsdynamic are erroring out with: | /usr/lib/perl/ptest/perl_langinfo.h:8:10: fatal error: xconfig.h: No such file or directory | 8 | #include "xconfig.h" xconfig.h contains references to the build host architecture and was removed by commit 2e0f30c46802 ("perl: do not install files that contain build host specific data") However, it is still included from various other places including these tests, and we are still depending on build host architecture data by including the patches from perl-cross recipe, a dependency to perl recipe. xconfig.h was added back as a copy step in the commit f90922cdeef5 ("update 5.36.1 -> 5.38.0") but was not added back in perl-ptest include file. Borrowed the logic from the above commit to make a copy of config.h that is specific to the target architecture. The changes in this commit fixes the test failures. Signed-off-by: Rajendra Desai --- meta/recipes-devtools/perl/perl-ptest.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/perl-ptest.inc b/meta/recipes-devtools/perl/perl-ptest.inc index e07355d3f5..42d46dfd78 100644 --- a/meta/recipes-devtools/perl/perl-ptest.inc +++ b/meta/recipes-devtools/perl/perl-ptest.inc @@ -20,6 +20,11 @@ do_install_ptest () { ln -sf ${bindir}/perl ${D}${PTEST_PATH}/t/perl + # xconfig.h contains references to build host architecture, and yet is included from various other places. + # To make it reproducible let's make it a copy of config.h patch that is specific to the target architecture. + # It is believed that the original header is the product of building miniperl (a helper executable built with host compiler). + cp ${D}${libdir}/perl5/${PV}/${TARGET_ARCH}-linux/CORE/config.h ${D}${PTEST_PATH}/xconfig.h + # Remove build host references from various scattered files... find "${D}${PTEST_PATH}" \ \( -name '*.PL' -o -name 'myconfig' -o -name 'cflags' -o -name '*.pl' -o -name '*.sh' -o -name '*.pm' \ @@ -44,7 +49,7 @@ do_install_ptest () { sed -i -e '/Autogenerated starting on/d' ${D}${PTEST_PATH}/lib/unicore/mktables.lst # Remove files with host-specific configuration for building native binaries - rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.h ${D}${PTEST_PATH}/xconfig.sh + rm ${D}${PTEST_PATH}/Makefile.config ${D}${PTEST_PATH}/xconfig.sh } python populate_packages:prepend() {