opendds: Get the version of Perl with get_perl_version of cpan-base

Current Yocto switched from 5.38.2 to 5.40.x Signed-off-by: Jan Vermaete <[email protected]>
OpenDDS · Oct 14, 2024 · 8aec620 · 8aec620
1 parent 334979b
commit 8aec620
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/recipes-connectivity/opendds/opendds.inc b/recipes-connectivity/opendds/opendds.inc
@@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/OpenDDS/OpenDDS/issues"
 LICENSE = "OpenDDS"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=11ee76f6fb51f69658b5bb8327c50b11"
 
-inherit autotools ptest
+inherit autotools ptest cpan-base
 
 SRC_URI:append = " file://run-ptest"
 
@@ -225,23 +225,24 @@ do_install_ptest() {
     # A symbolic link because the test script will search the execuables under DDS_ROOT.
     # But because of the --prefix in the configure they are installed under /usr/bin
     ln -s ${bindir} ${D}${datadir}/DDS_ROOT/bin
-    install -d ${D}/usr/lib/perl5/5.38.2/PerlACE
-    install -m 644 ${S}/ACE_wrappers/bin/PerlACE/*.pm ${D}/usr/lib/perl5/5.38.2/PerlACE
-    install -d ${D}/usr/lib/perl5/5.38.2/PerlDDS
-    install -m 644 ${S}/bin/PerlDDS/*.pm ${D}/usr/lib/perl5/5.38.2/PerlDDS
+    install -d ${D}/usr/lib/perl5/${@get_perl_version(d)}/PerlACE
+    install -m 644 ${S}/ACE_wrappers/bin/PerlACE/*.pm ${D}/usr/lib/perl5/${@get_perl_version(d)}/PerlACE
+    install -d ${D}/usr/lib/perl5/${@get_perl_version(d)}/PerlDDS
+    install -m 644 ${S}/bin/PerlDDS/*.pm ${D}/usr/lib/perl5/${@get_perl_version(d)}/PerlDDS
     install -d ${D}${datadir}/DDS_ROOT/tools/scripts/modules
     install -m 644 ${S}/tools/scripts/modules/*.pm ${D}${datadir}/DDS_ROOT/tools/scripts/modules
 
 }
 
 PACKAGES += "${PN}-ishapes"
 
-INSANE_SKIP:${PN} += "dev-so"
-INSANE_SKIP:${PN}-dev += "libdir"
+INSANE_SKIP:${PN} += "buildpaths dev-so libdir"
+INSANE_SKIP:${PN}-dbg += "buildpaths dev-so libdir"
+INSANE_SKIP:${PN}-dev += "buildpaths libdir"
 
 FILES:${PN}-dev += "${datadir}"
 FILES:${PN}-ishapes += "${bindir}/ishapes"
-FILES:${PN}-ptest += "${libdir}/perl5/5.38.2/PerlACE ${libdir}/perl5/5.38.2/PerlDDS"
+FILES:${PN}-ptest += "${libdir}/perl5/${@get_perl_version(d)}/PerlACE ${libdir}/perl5/${@get_perl_version(d)}/PerlDDS"
 
 ALLOW_EMPTY:${PN}-ishapes = "1"