Patchwork cpan_build: Unify directory layout for native and target builds

login
register
mail settings
Submitter Phil Blundell
Date Sept. 25, 2012, 9:33 p.m.
Message ID <1348608781.1335.9.camel@x121e.pbcl.net>
Download mbox | patch
Permalink /patch/37217/
State Accepted
Commit 2637809901aca14f1fe8367ba0a081aaf470df05
Headers show

Comments

Phil Blundell - Sept. 25, 2012, 9:33 p.m.
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.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
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(-)
Saul Wold - Oct. 18, 2012, 7:51 p.m.
On 09/25/2012 02:33 PM, Phil Blundell wrote:
> 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.
>
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
> 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(-)
>
> diff --git a/meta/classes/cpan_build.bbclass
> b/meta/classes/cpan_build.bbclass
> index 36ffc56..0809602 100644
> --- a/meta/classes/cpan_build.bbclass
> +++ b/meta/classes/cpan_build.bbclass
> @@ -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 () {
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/cpan_build.bbclass
b/meta/classes/cpan_build.bbclass
index 36ffc56..0809602 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -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 () {