Skip to contentSkip to conversation

cpan_build: Unify directory layout for native and target builds

PATCH Applied Phil Blundell 2 participants 2 messages Sep 25, 2012 – Oct 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cpan_build: Unify directory layout for native and target builds

There seems to be no benefit in having them be different and this appears to cause a certain amount of confusion about paths for the native modules.

---
previously posted as RFC, no comments so reposting as an actual patch

 meta/classes/cpan_build.bbclass |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/meta/classes/cpan_build.bbclass
index 36ffc56..0809602 100644

meta/classes/cpan_build.bbclass +2 -5
@@ -23,8 +23,9 @@ cpan_build_do_configure () {
 	if [ ${@is_target(d)} == "yes" ]; then
 		# build for target
 		. ${STAGING_LIBDIR}/perl/config.sh
+	fi
 
-			perl Build.PL --installdirs vendor \
+	perl Build.PL --installdirs vendor \
 				--destdir ${D} \
 				--install_path lib="${datadir}/perl" \
 				--install_path arch="${libdir}/perl" \
@@ -32,10 +33,6 @@ cpan_build_do_configure () {
 				--install_path bin=${bindir} \
 				--install_path bindoc=${mandir}/man1 \
 				--install_path libdoc=${mandir}/man3
-	else
-		# build for host
-		perl Build.PL --installdirs site --destdir ${D}
-	fi
 }
 
 cpan_build_do_compile () {
Signature · 1 line
1.7.9
Applied
#1 lore raw
Quoted 29 lines · Phil Blundell

There seems to be no benefit in having them be different and this appears to cause a certain amount of confusion about paths for the native modules.

---
previously posted as RFC, no comments so reposting as an actual patch

  meta/classes/cpan_build.bbclass |    7 ++-----
  1 files changed, 2 insertions(+), 5 deletions(-)
meta/classes/cpan_build.bbclass +2 -1
index 36ffc56..0809602 100644
@@ -23,8 +23,9 @@ cpan_build_do_configure () {
  	if [ ${@is_target(d)} == "yes" ]; then
  		# build for target
  		. ${STAGING_LIBDIR}/perl/config.sh
+	fi
 
-			perl Build.PL --installdirs vendor \
+	perl Build.PL --installdirs vendor \
  				--destdir ${D} \
  				--install_path lib="${datadir}/perl" \
  				--install_path arch="${libdir}/perl" \

meta/classes/cpan_build.bbclass cpan_build_do_configure () { · line 38

Quoted 10 lines
meta/classes/cpan_build.bbclass +0 -4
@@ -32,10 +33,6 @@ cpan_build_do_configure () {
  				--install_path bin=${bindir} \
  				--install_path bindoc=${mandir}/man1 \
  				--install_path libdoc=${mandir}/man3
-	else
-		# build for host
-		perl Build.PL --installdirs site --destdir ${D}
-	fi
  }
 
  cpan_build_do_compile () {

Merged into OE-Core

Thanks
Sau!