test-meson-builds: allow building outside source dir

Message ID 20190401160833.38213-1-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Headers
Series test-meson-builds: allow building outside source dir |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson April 1, 2019, 4:08 p.m. UTC
  The test-meson-builds.sh script correctly detects the source directory and
builds the native builds successfully in a directory outside of the source
tree. However, the paths to the cross-files are not prefixed with the
source directory path, so the cross-builds all fail. Fix this by prepending
the source directory path appropriately.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 devtools/test-meson-builds.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Luca Boccassi April 1, 2019, 4:23 p.m. UTC | #1
On Mon, 2019-04-01 at 17:08 +0100, Bruce Richardson wrote:
> The test-meson-builds.sh script correctly detects the source
> directory and
> builds the native builds successfully in a directory outside of the
> source
> tree. However, the paths to the cross-files are not prefixed with the
> source directory path, so the cross-builds all fail. Fix this by
> prepending
> the source directory path appropriately.
> 
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
>  devtools/test-meson-builds.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-
> builds.sh
> index e3f19a01a..b3b5cfbb5 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -69,9 +69,9 @@ if command -v $c >/dev/null 2>&1 ; then
>  	# compile the general v8a also for clang to increase coverage
>  	export CC="ccache clang"
>  	build build-arm64-host-clang $use_shared \
> -		--cross-file config/arm/arm64_armv8_linux_gcc
> +		--cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
>  
> -	for f in config/arm/arm*gcc ; do
> +	for f in $srcdir/config/arm/arm*gcc ; do
>  		export CC="ccache gcc"
>  		build build-$(basename $f | tr '_' '-' | cut -d'-' -f-
> 2) \
>  			$use_shared --cross-file $f
> 

Acked-by: Luca Boccassi <bluca@debian.org>
  
Thomas Monjalon April 1, 2019, 8:01 p.m. UTC | #2
01/04/2019 18:23, Luca Boccassi:
> On Mon, 2019-04-01 at 17:08 +0100, Bruce Richardson wrote:
> > The test-meson-builds.sh script correctly detects the source
> > directory and
> > builds the native builds successfully in a directory outside of the
> > source
> > tree. However, the paths to the cross-files are not prefixed with the
> > source directory path, so the cross-builds all fail. Fix this by
> > prepending
> > the source directory path appropriately.
> > 
> > Signed-off-by: Bruce Richardson <
> > bruce.richardson@intel.com
> 
> Acked-by: Luca Boccassi <bluca@debian.org>

Applied, thanks
  

Patch

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e3f19a01a..b3b5cfbb5 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -69,9 +69,9 @@  if command -v $c >/dev/null 2>&1 ; then
 	# compile the general v8a also for clang to increase coverage
 	export CC="ccache clang"
 	build build-arm64-host-clang $use_shared \
-		--cross-file config/arm/arm64_armv8_linux_gcc
+		--cross-file $srcdir/config/arm/arm64_armv8_linux_gcc
 
-	for f in config/arm/arm*gcc ; do
+	for f in $srcdir/config/arm/arm*gcc ; do
 		export CC="ccache gcc"
 		build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \
 			$use_shared --cross-file $f