utils: abi-compat: sort meson options
diff mbox series

Message ID 20240924173433.3378703-1-kieran.bingham@ideasonboard.com
State Accepted
Commit 44b49af7a0a870d5fce5c162e3998ef3696912d5
Headers show
Series
  • utils: abi-compat: sort meson options
Related show

Commit Message

Kieran Bingham Sept. 24, 2024, 5:34 p.m. UTC 
Sort the options passed to meson setup alphabetically when performing a
slimline libcamera build.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

---
This is based on top of https://patchwork.libcamera.org/patch/21347/

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 utils/abi-compat.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Laurent Pinchart Sept. 24, 2024, 5:40 p.m. UTC | #1 
On Tue, Sep 24, 2024 at 06:34:33PM +0100, Kieran Bingham wrote:
> Sort the options passed to meson setup alphabetically when performing a
> slimline libcamera build.
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> This is based on top of https://patchwork.libcamera.org/patch/21347/
> 
> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> ---
>  utils/abi-compat.sh | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/utils/abi-compat.sh b/utils/abi-compat.sh
> index a7b2481572bd..31f61e320404 100755
> --- a/utils/abi-compat.sh
> +++ b/utils/abi-compat.sh
> @@ -156,16 +156,16 @@ create_abi_dump() {
>  		# Generate a minimal libcamera build. "lib" and "prefix" are
>  		# defined explicitly to avoid system default ambiguities.
>  		meson setup "$build" "$worktree" \
> -			-Dlibdir=lib \
> -			-Dprefix=/usr/local/ \
> -			-Ddocumentation=disabled \
>  			-Dcam=disabled \
> -			-Dqcam=disabled \
> -			-Dpycamera=disabled \
> +			-Ddocumentation=disabled \
>  			-Dgstreamer=disabled \
>  			-Dlc-compliance=disabled \
> -			-Dtracing=disabled \
> -			-Dpipelines=
> +			-Dlibdir=lib \
> +			-Dpipelines= \
> +			-Dprefix=/usr/local/ \
> +			-Dpycamera=disabled \
> +			-Dqcam=disabled \
> +			-Dtracing=disabled
>  
>  		ninja -C "$build"
>  		DESTDIR="$install" ninja -C "$build" install

Patch
diff mbox series 

diff --git a/utils/abi-compat.sh b/utils/abi-compat.sh
index a7b2481572bd..31f61e320404 100755
--- a/utils/abi-compat.sh
+++ b/utils/abi-compat.sh
@@ -156,16 +156,16 @@  create_abi_dump() {
 		# Generate a minimal libcamera build. "lib" and "prefix" are
 		# defined explicitly to avoid system default ambiguities.
 		meson setup "$build" "$worktree" \
-			-Dlibdir=lib \
-			-Dprefix=/usr/local/ \
-			-Ddocumentation=disabled \
 			-Dcam=disabled \
-			-Dqcam=disabled \
-			-Dpycamera=disabled \
+			-Ddocumentation=disabled \
 			-Dgstreamer=disabled \
 			-Dlc-compliance=disabled \
-			-Dtracing=disabled \
-			-Dpipelines=
+			-Dlibdir=lib \
+			-Dpipelines= \
+			-Dprefix=/usr/local/ \
+			-Dpycamera=disabled \
+			-Dqcam=disabled \
+			-Dtracing=disabled
 
 		ninja -C "$build"
 		DESTDIR="$install" ninja -C "$build" install